From 7a8cb66a15a4335cdb61bbbf0c28673cee272534 Mon Sep 17 00:00:00 2001 From: fdumont Date: Sat, 20 Dec 2014 08:37:02 +0000 Subject: [PATCH] =?utf8?q?2014-12-20=20=20Fran=C3=A7ois=20Dumont=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * include/bits/c++config: inline __cxx11 namespace within namespace __cxx1998. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218988 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/c++config | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0572f17e1e4f..39e973c9420c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-12-20 François Dumont + + * include/bits/c++config: inline __cxx11 namespace within namespace + __cxx1998. + 2014-12-20 Jonathan Wakely * src/c++98/locale-inst.cc (__add_grouping, __pad, __int_to_char): diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index cffb065ce18f..ec7414dfd270 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -277,9 +277,13 @@ namespace std // Non-inline namespace for components replaced by alternates in active mode. namespace __cxx1998 { -#if _GLIBCXX_INLINE_VERSION - inline namespace __7 { } -#endif +# if _GLIBCXX_INLINE_VERSION + inline namespace __7 { } +# endif + +# if _GLIBCXX_USE_CXX11_ABI + inline namespace __cxx11 __attribute__((abi_tag)) { } +# endif } // Inline namespace for debug mode. -- 2.47.3