summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-29 21:35:57 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-29 21:35:57 +0000
commitfffc4f5aa923c40d26779bd42c871c4232e8a9b6 (patch)
tree31d49286a47b467d09f70b0fcfa043b578257c56 /libstdc++-v3
parent1217f2a0338e4d5a61411668037e62c4c0152185 (diff)
downloadgcc-fffc4f5aa923c40d26779bd42c871c4232e8a9b6.tar.gz
* python/libstdcxx/v6/printers.py
(SingleObjContainerPrinter._contained): Use compatibility mixin. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213227 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/python/libstdcxx/v6/printers.py4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c818e63756d..1ccb4634274 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-29 Jonathan Wakely <jwakely@redhat.com>
+
+ * python/libstdcxx/v6/printers.py
+ (SingleObjContainerPrinter._contained): Use compatibility mixin.
+
2014-07-29 François Dumont <fdumont@gcc.gnu.org>
* testsuite/util/testsuite_allocator.h
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 15d7a88dbf8..2e5cd6ca0a8 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