Hi
We once talk about rename the __cxx1998 namespace into something
less C++98 biased. Here is the patch to do so.
Ok with the new name ?
Tested under Linux x86_64 normal and debug modes.
Note that pretty printers do not work with Debug mode but for the
moment I checked the manually the output and it looks good. I'll try to
make those work in a future patch.
François
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 21e3fbb..919f269 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -192,7 +192,7 @@
namespace __debug { }
namespace __parallel { }
namespace __profile { }
- namespace __cxx1998 { }
+ namespace __normal { }
namespace __detail {
namespace __variant { } // C++17
@@ -317,7 +317,7 @@ namespace std
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Non-inline namespace for components replaced by alternates in active mode.
- namespace __cxx1998
+ namespace __normal
{
# if _GLIBCXX_USE_CXX11_ABI
inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
@@ -371,7 +371,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
// _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
// _GLIBCXX_END_NAMESPACE_CONTAINER
#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PROFILE)
-# define _GLIBCXX_STD_C __cxx1998
+# define _GLIBCXX_STD_C __normal
# define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER \
namespace _GLIBCXX_STD_C {
# define _GLIBCXX_END_NAMESPACE_CONTAINER }
@@ -382,7 +382,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
#endif
#ifdef _GLIBCXX_PARALLEL
-# define _GLIBCXX_STD_A __cxx1998
+# define _GLIBCXX_STD_A __normal
# define _GLIBCXX_BEGIN_NAMESPACE_ALGO \
namespace _GLIBCXX_STD_A {
# define _GLIBCXX_END_NAMESPACE_ALGO }
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index b7b2a0f..3f928ea 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -1232,7 +1232,7 @@ class Printer(object):
# Add a name using _GLIBCXX_BEGIN_NAMESPACE_CONTAINER.
def add_container(self, base, name, function):
self.add_version(base, name, function)
- self.add_version(base + '__cxx1998::', name, function)
+ self.add_version(base + '__normal::', name, function)
@staticmethod
def get_basic_type(type):
