From da03858bf025666c6fad437b833be11ca9badd54 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 23 Jul 2014 11:45:17 +0100 Subject: [PATCH] printers.py (StdExpAnyPrinter): Convert type to string instead of using gdb.Type.name attribute. * python/libstdcxx/v6/printers.py (StdExpAnyPrinter): Convert type to string instead of using gdb.Type.name attribute. From-SVN: r212929 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/python/libstdcxx/v6/printers.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ec816ba085c..219f79448be 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-07-23 Jonathan Wakely + + * python/libstdcxx/v6/printers.py (StdExpAnyPrinter): Convert type + to string instead of using gdb.Type.name attribute. + 2014-07-19 Jonathan Wakely * acinclude.m4 (GLIBCXX_CHECK_SDT_H): Replace AC_MSG_RESULT with diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 625396b4459..15d7a88dbf8 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -899,7 +899,7 @@ class StdExpAnyPrinter(SingleObjContainerPrinter): raise ValueError("Unknown manager function in std::experimental::any") # FIXME need to expand 'std::string' so that gdb.lookup_type works - mgrname = re.sub("std::string(?!\w)", gdb.lookup_type('std::string').strip_typedefs().name, m.group(1)) + mgrname = re.sub("std::string(?!\w)", str(gdb.lookup_type('std::string').strip_typedefs()), m.group(1)) mgrtype = gdb.lookup_type(mgrname) self.contained_type = mgrtype.template_argument(0) valptr = None