diff options
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/printers.py | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 0bf307b..c0f061f 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -245,7 +245,7 @@ class UniquePointerPrinter: def __init__ (self, typename, val): self.val = val - impl_type = val.type.fields()[0].type.tag + impl_type = val.type.fields()[0].type.strip_typedefs() # Check for new implementations first: if is_specialization_of(impl_type, '__uniq_ptr_data') \ or is_specialization_of(impl_type, '__uniq_ptr_impl'): @@ -253,7 +253,7 @@ class UniquePointerPrinter: elif is_specialization_of(impl_type, 'tuple'): tuple_member = val['_M_t'] else: - raise ValueError("Unsupported implementation for unique_ptr: %s" % impl_type) + raise ValueError("Unsupported implementation for unique_ptr: %s" % str(impl_type)) tuple_impl_type = tuple_member.type.fields()[0].type # _Tuple_impl tuple_head_type = tuple_impl_type.fields()[1].type # _Head_base head_field = tuple_head_type.fields()[0] @@ -262,7 +262,7 @@ class UniquePointerPrinter: elif head_field.is_base_class: self.pointer = tuple_member.cast(head_field.type) else: - raise ValueError("Unsupported implementation for tuple in unique_ptr: %s" % impl_type) + raise ValueError("Unsupported implementation for tuple in unique_ptr: %s" % str(impl_type)) def children (self): return SmartPtrIterator(self.pointer) diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc index f1c3b59..c681bec 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/compat.cc @@ -53,7 +53,9 @@ namespace std { unique_ptr(T* p) { _M_t._M_head_impl = p; } - tuple<T*, D> _M_t; + using __tuple_type = tuple<T*, D>; + + __tuple_type _M_t; }; // Old representation of std::optional, before GCC 9 |