From 4681f59563ac941fb7a2e764150ddf65d7ff91a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Wed, 1 Oct 2014 19:24:23 +0000 Subject: [PATCH] printers.py (StdDebugIteratorPrinter.to_string): Adapt to latest modifications on debug iterators. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2014-10-01 François Dumont * python/libstdcxx/v6/printers.py (StdDebugIteratorPrinter.to_string): Adapt to latest modifications on debug iterators. From-SVN: r215775 --- libstdc++-v3/ChangeLog | 7 ++++++- libstdc++-v3/python/libstdcxx/v6/printers.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 02ffb3e93c9..54f00ac343f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,7 +1,12 @@ +2014-10-01 François Dumont + + * python/libstdcxx/v6/printers.py (StdDebugIteratorPrinter.to_string): + Adapt to latest modifications on debug iterators. + 2014-10-01 Edward Smith-Rowland <3dw4rd@verizon.net> * include/std/type_traits: Add is_final<> type trait for C++14. - * testsuite/util/testsuite_tr1.h: Add + * testsuite/util/testsuite_tr1.h: Add * testsuite/20_util/is_final/requirements/ explicit_instantiation.cc: New. * testsuite/20_util/is_final/requirements/typedefs.cc: New. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 2e5cd6ca0a8..48ecb678cf3 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -460,7 +460,7 @@ class StdDebugIteratorPrinter: # and return the wrapped iterator value. def to_string (self): itype = self.val.type.template_argument(0) - return self.val['_M_current'].cast(itype) + return self.val.cast(itype) class StdMapPrinter: "Print a std::map or std::multimap" -- 2.30.2