aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2014-12-20 08:37:02 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2014-12-20 08:37:02 +0000
commit9836f82e7a4e2089fd8a023d7ac041d7c9a53a64 (patch)
treeeca63eb30b549ad7db8b2a490b974b128b6bc5f6
parent42e99e70e696fca06fa3012ae4917ebf58c5ac0b (diff)
downloadgcc-9836f82e7a4e2089fd8a023d7ac041d7c9a53a64.zip
gcc-9836f82e7a4e2089fd8a023d7ac041d7c9a53a64.tar.gz
gcc-9836f82e7a4e2089fd8a023d7ac041d7c9a53a64.tar.bz2
c++config: inline __cxx11 namespace within namespace __cxx1998.
2014-12-20 François Dumont <fdumont@gcc.gnu.org> * include/bits/c++config: inline __cxx11 namespace within namespace __cxx1998. From-SVN: r218988
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/c++config10
2 files changed, 12 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0572f17..39e973c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-20 François Dumont <fdumont@gcc.gnu.org>
+
+ * include/bits/c++config: inline __cxx11 namespace within namespace
+ __cxx1998.
+
2014-12-20 Jonathan Wakely <jwakely@redhat.com>
* 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 cffb065..ec7414d 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.