From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 28 Nov 2024 15:23:25 +0000 (+0000)
Subject: libstdc++: Reorder printer registrations in printers.py
X-Git-Tag: basepoints/gcc-16~3791
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bba4ca26c9919c0d5b590d648bd0ae9adc678ac;p=thirdparty%2Fgcc.git

libstdc++: Reorder printer registrations in printers.py

Register StdIntegralConstantPrinter with the other C++11 printers, and
register StdTextEncodingPrinter after C++20 printers.

libstdc++-v3/ChangeLog:

	* python/libstdcxx/v6/printers.py: Reorder registrations.
---

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index d05b79762fdd..37ca51b26286 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -2830,10 +2830,6 @@ def build_libstdcxx_dictionary():
     # vector<bool>
     libstdcxx_printer.add_version('std::', 'locale', StdLocalePrinter)
 
-    libstdcxx_printer.add_version('std::', 'integral_constant',
-                                  StdIntegralConstantPrinter)
-    libstdcxx_printer.add_version('std::', 'text_encoding',
-                                  StdTextEncodingPrinter)
 
     if hasattr(gdb.Value, 'dynamic_type'):
         libstdcxx_printer.add_version('std::', 'error_code',
@@ -2896,6 +2892,8 @@ def build_libstdcxx_dictionary():
                                   StdChronoDurationPrinter)
     libstdcxx_printer.add_version('std::chrono::', 'time_point',
                                   StdChronoTimePointPrinter)
+    libstdcxx_printer.add_version('std::', 'integral_constant',
+                                  StdIntegralConstantPrinter)
 
     # std::regex components
     libstdcxx_printer.add_version('std::__detail::', '_State',
@@ -2971,6 +2969,9 @@ def build_libstdcxx_dictionary():
     # libstdcxx_printer.add_version('std::chrono::(anonymous namespace)', 'Rule',
     #                              StdChronoTimeZoneRulePrinter)
 
+    # C++26 components
+    libstdcxx_printer.add_version('std::', 'text_encoding',
+                                  StdTextEncodingPrinter)
     # Extensions.
     libstdcxx_printer.add_version('__gnu_cxx::', 'slist', StdSlistPrinter)