Message ID | 5494BA51.4070004@gmail.com |
---|---|
State | New |
Headers | show |
On 20/12/14 00:52 +0100, François Dumont wrote: >Hello > > Great news. > > However we need the following to make debug/profile modes happy. Ah, thanks for checking it. > Shouldn't we use _GLIBCXX_ABI_TAG_CXX11 to tag the __cxx11 namespace ? No, that is defined to __attribute__((abi_tag("cxx11"))) but you don't need a string for the tag on namespaces, just __attribute__((abi_tag)) works (and it uses the namespace name as the tag name). >2014-12-20 François Dumont <fdumont@gcc.gnu.org> > > * include/bits/c++config: inline __cxx11 namespace within namespace > __cxx1998. > >Ok to commit ? Yes, this fixes the default configuration, so OK for trunk. I'll test it for the alternative configurations tomorrow. Thanks!
Index: include/bits/c++config =================================================================== --- include/bits/c++config (revision 218970) +++ include/bits/c++config (working copy) @@ -277,9 +277,13 @@ // 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.