From 33b43b0d8cd2de722d177ef823930500948a7487 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 9 Oct 2018 14:06:46 +0100 Subject: [PATCH] Define std::string and related typedefs outside __cxx11 namespace The typedefs for common specializations of std::__cxx11::basic_string do not need to be in the std::__cxx11 namespace. Those typedefs are never used for linkage purposes so don't appear in mangled names, and so don't need to be distinct from the equivalent typedefs for the COW std::basic_string specializations. It is OK for the same typedef to refer to different types in different translation units. Defining them directly in namespace std improves diagnostics that use those typedefs. For example: error: could not convert '1' from 'int' to 'std::__cxx11::string' {aka 'std::__cxx11::basic_string'} will now be printed as: error: could not convert '1' from 'int' to 'std::string' {aka 'std::__cxx11::basic_string'} The precise type is still shown, but the typedef is not obfuscated with the inline namespace. * include/bits/stringfwd.h (string, wstring, u16string, u32string): Define typedefs outside of __cxx11 inline namespace. * python/libstdcxx/v6/printers.py (register_type_printers): Also register printers for typedefs in new location. From-SVN: r264958 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/bits/stringfwd.h | 4 ++-- libstdc++-v3/python/libstdcxx/v6/printers.py | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 12dee3a273c..114a2ffb66c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2018-10-09 Jonathan Wakely + + * include/bits/stringfwd.h (string, wstring, u16string, u32string): + Define typedefs outside of __cxx11 inline namespace. + * python/libstdcxx/v6/printers.py (register_type_printers): Also + register printers for typedefs in new location. + 2018-10-08 Jonathan Wakely PR libstdc++/87538 diff --git a/libstdc++-v3/include/bits/stringfwd.h b/libstdc++-v3/include/bits/stringfwd.h index 15eb7183633..2b7f4612cbc 100644 --- a/libstdc++-v3/include/bits/stringfwd.h +++ b/libstdc++-v3/include/bits/stringfwd.h @@ -69,6 +69,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 typename _Alloc = allocator<_CharT> > class basic_string; +_GLIBCXX_END_NAMESPACE_CXX11 + /// A string of @c char typedef basic_string string; @@ -85,8 +87,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 typedef basic_string u32string; #endif -_GLIBCXX_END_NAMESPACE_CXX11 - /** @} */ _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index afe1b325d87..827c87b70ea 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -1556,6 +1556,8 @@ def register_type_printers(obj): # Add type printers for typedefs std::string, std::wstring etc. for ch in ('', 'w', 'u16', 'u32'): add_one_type_printer(obj, 'basic_string', ch + 'string') + add_one_type_printer(obj, '__cxx11::basic_string', ch + 'string') + # Typedefs for __cxx11::basic_string used to be in namespace __cxx11: add_one_type_printer(obj, '__cxx11::basic_string', '__cxx11::' + ch + 'string') add_one_type_printer(obj, 'basic_string_view', ch + 'string_view') @@ -1568,7 +1570,7 @@ def register_type_printers(obj): for x in ('stringbuf', 'istringstream', 'ostringstream', 'stringstream'): add_one_type_printer(obj, 'basic_' + x, ch + x) - # types are in __cxx11 namespace, but typedefs aren'x: + # types are in __cxx11 namespace, but typedefs aren't: add_one_type_printer(obj, '__cxx11::basic_' + x, ch + x) # Add type printers for typedefs regex, wregex, cmatch, wcmatch etc. -- 2.30.2