diff options
Diffstat (limited to 'libstdc++-v3/include/experimental/string')
| -rw-r--r-- | libstdc++-v3/include/experimental/string | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/libstdc++-v3/include/experimental/string b/libstdc++-v3/include/experimental/string index 5347991959e..893013b1869 100644 --- a/libstdc++-v3/include/experimental/string +++ b/libstdc++-v3/include/experimental/string @@ -41,12 +41,12 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace experimental { inline namespace fundamentals_v2 { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - template<typename _CharT, typename _Traits, typename _Alloc, typename _Predicate> inline void @@ -64,30 +64,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __cont.end()); } -_GLIBCXX_END_NAMESPACE_VERSION + namespace pmr { + _GLIBCXX_BEGIN_NAMESPACE_CXX11 -namespace pmr { -_GLIBCXX_BEGIN_NAMESPACE_VERSION -_GLIBCXX_BEGIN_NAMESPACE_CXX11 + // basic_string using polymorphic allocator in namespace pmr + template<typename _CharT, typename _Traits = char_traits<_CharT>> + using basic_string = + std::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>; - // basic_string using polymorphic allocator in namespace pmr - template<typename _CharT, typename _Traits = char_traits<_CharT>> - using basic_string = - std::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>; - - // basic_string typedef names using polymorphic allocator in namespace - // std::experimental::pmr - typedef basic_string<char> string; - typedef basic_string<char16_t> u16string; - typedef basic_string<char32_t> u32string; - typedef basic_string<wchar_t> wstring; - -_GLIBCXX_END_NAMESPACE_CXX11 -_GLIBCXX_END_NAMESPACE_VERSION -} // namespace pmr + // basic_string typedef names using polymorphic allocator in namespace + // std::experimental::pmr + typedef basic_string<char> string; + typedef basic_string<char16_t> u16string; + typedef basic_string<char32_t> u32string; + typedef basic_string<wchar_t> wstring; + _GLIBCXX_END_NAMESPACE_CXX11 + } // namespace pmr } // namespace fundamentals_v2 } // namespace experimental + +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++14 |