From acfdd51fc8a4de16ff62a68d9059d49c9911d3ee Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 3 Oct 2015 13:09:36 +0100 Subject: [PATCH] Remove pretty printing for 'any' with allocators * python/libstdcxx/v6/printers.py (StdExpAnyPrinter): Remove support for _Manager_alloc. From-SVN: r228447 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/python/libstdcxx/v6/printers.py | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c01d8d5f8b1..fa18ecea0f2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2015-10-03 Jonathan Wakely + * python/libstdcxx/v6/printers.py (StdExpAnyPrinter): Remove support + for _Manager_alloc. + * src/c++98/locale.cc: Fix comment. * src/c++98/locale_init.cc: Likewise. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 2d167863ad3..12e732e4a76 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -945,10 +945,6 @@ class StdExpAnyPrinter(SingleObjContainerPrinter): valptr = self.val['_M_storage']['_M_buffer'].address elif '::_Manager_external' in mgrname: valptr = self.val['_M_storage']['_M_ptr'] - elif '::_Manager_alloc' in mgrname: - datatype = gdb.lookup_type(mgrname + '::_Data') - valptr = self.val['_M_storage']['_M_ptr'].cast(datatype.pointer()) - valptr = valptr.dereference()['_M_data'].address else: raise ValueError("Unknown manager function in std::experimental::any") contained_value = valptr.cast(self.contained_type.pointer()).dereference() -- 2.30.2