From faf7f829a84986dbd7b6e088633f18193486f272 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 18 Jul 2014 16:56:00 +0100 Subject: re PR libstdc++/61835 (Invalid comment on pretty printers breaks gdb) PR libstdc++/61835 * python/libstdcxx/v6/printers.py (TemplateTypePrinter): Use raw string. (SingleObjContainerPrinter): Check if type printers are in use. From-SVN: r212822 --- libstdc++-v3/python/libstdcxx/v6/printers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libstdc++-v3/python') diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index af41f1f..625396b 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -845,6 +845,9 @@ class SingleObjContainerPrinter(object): def _recognize(self, type): """Return TYPE as a string after applying type printers""" + global _use_type_printing + if not _use_type_printing: + return str(type) return gdb.types.apply_type_recognizers(gdb.types.get_type_recognizers(), type) or str(type) @@ -1043,7 +1046,7 @@ class Printer(object): libstdcxx_printer = None class TemplateTypePrinter(object): - """A type printer for class templates. + r"""A type printer for class templates. Recognizes type names that match a regular expression. Replaces them with a formatted string which can use replacement field -- cgit v1.1