diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-03 12:09:36 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-03 12:09:36 +0000 |
| commit | b4b7129fb3221c87ac413469fc7352d159e6f218 (patch) | |
| tree | 25281176ad6ba25c5f5b3f9a2cb04fc98f6e7b5b | |
| parent | 88cf98838d9d1ad8db22453f1f18f1ae50a6b703 (diff) | |
| download | gcc-b4b7129fb3221c87ac413469fc7352d159e6f218.tar.gz | |
Remove pretty printing for 'any' with allocators
* python/libstdcxx/v6/printers.py (StdExpAnyPrinter): Remove support
for _Manager_alloc.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228447 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | 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 <jwakely@redhat.com> + * 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() |