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
This commit is contained in:
François Dumont 2014-12-20 08:37:02 +00:00
parent 42e99e70e6
commit 9836f82e7a
2 changed files with 12 additions and 3 deletions

View File

@ -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):

View File

@ -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.