From patchwork Tue Jul 29 21:33:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 374601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AF0DB140184 for ; Wed, 30 Jul 2014 07:34:06 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; q=dns; s= default; b=d+5jqOZhxqYKhtDXRzbG0k+1fFGzH1J8TFWh7peUApI+8mXsiUW9E mQHNyNrqxJRRZFlSEmQy1ontNrJGY1tBAVW7i4uGkx7dpR5Oi7OcMtZyBsIycSUr rDB4VGht0vn8ugWLv/Do/i2HdDRZ+sCd+Il/Kf/zQ3lRlCPUzvCuiw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:references:mime-version :content-type:content-transfer-encoding:in-reply-to; s=default; bh=ssJu9QT7bhoA5V/eS6cWyKiZ0+c=; b=H6sC65XhUVPTiYbdJ51H3VXGSnKE e9czmz9E7Tt0JSF1hJyeJdqnenv/ZTMj3S1O7o+0AChwSmHMSOqyfjpcn74YL0AB eZZPoydVnoYOTrseATbKq5R9i7oGSN5YvfRwSHW0+WvIxpTip70E+ztJ8w78D1rq +os974WLV6DnOio= Received: (qmail 24721 invoked by alias); 29 Jul 2014 21:33:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 24704 invoked by uid 89); 29 Jul 2014 21:33:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 29 Jul 2014 21:33:57 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6TLXuGT025793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Jul 2014 17:33:56 -0400 Received: from localhost (ovpn-116-94.ams2.redhat.com [10.36.116.94]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6TLXtgs021399; Tue, 29 Jul 2014 17:33:55 -0400 Date: Tue, 29 Jul 2014 22:33:54 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: =?iso-8859-1?Q?Fran=E7ois?= Dumont , Paolo Carlini Subject: Re: testsuite allocators patch Message-ID: <20140729213354.GA2361@redhat.com> References: <53AC8678.5060706@gmail.com> <53AC8ED5.3070000@oracle.com> <20140626223858.GK2711@redhat.com> <53AD1CCC.2010309@oracle.com> <53ADCA79.2090007@oracle.com> <53D01C0B.2030203@gmail.com> <20140724085538.GS2361@redhat.com> <53D16880.8060904@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) On 25/07/14 00:19 +0100, Jonathan Wakely wrote: >On 24 July 2014 21:11, François Dumont wrote: >> >> Yes I have tested with no other changes in my tree and got only those pretty >> printers errors which are unrelated I think: >> >> Python Exception iter() returned non-iterator of type >> '_contained': >> $2 = std::experimental::optional [no contained value] > >I haven't seen these, I'll fix them on Monday, thanks. Fixed by the attached patch. Tested x86_64-linux (thanks to Samual Bronson for testing with Python3) and committed to trunk. commit 7de83299c42041611360a1426f5164270ac6c6b6 Author: Jonathan Wakely Date: Tue Jul 29 20:08:31 2014 +0100 * python/libstdcxx/v6/printers.py (SingleObjContainerPrinter._contained): Use compatibility mixin. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 15d7a88..2e5cd6c 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -851,14 +851,14 @@ class SingleObjContainerPrinter(object): return gdb.types.apply_type_recognizers(gdb.types.get_type_recognizers(), type) or str(type) - class _contained: + class _contained(Iterator): def __init__ (self, val): self.val = val def __iter__ (self): return self - def next (self): + def __next__(self): if self.val is None: raise StopIteration retval = self.val