re PR libstdc++/81064 (Inline namespace regression)

[thirdparty/gcc.git] / libstdc++-v3 / include / experimental / set

diff --git a/libstdc++-v3/include/experimental/set b/libstdc++-v3/include/experimental/set
index a10617bb2a9e1042a954bac58657950070ec956c..fba136c90c5559a92fa74f53ea7798d2c01fdc49 100644 (file)
--- a/libstdc++-v3/include/experimental/set
+++ b/libstdc++-v3/include/experimental/set
@@ -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 _Key, typename _Compare, typename _Alloc,
           typename _Predicate>
     inline void
@@ -59,23 +59,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     erase_if(multiset<_Key, _Compare, _Alloc>& __cont, _Predicate __pred)
     { __detail::__erase_nodes_if(__cont, __pred); }
 
-_GLIBCXX_END_NAMESPACE_VERSION
-
-namespace pmr {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-  template<typename _Key, typename _Compare = less<_Key>>
-    using set = std::set<_Key, _Compare, polymorphic_allocator<_Key>>;
-
-  template<typename _Key, typename _Compare = less<_Key>>
-    using multiset = std::multiset<_Key, _Compare,
-                                  polymorphic_allocator<_Key>>;
+  namespace pmr {
+    template<typename _Key, typename _Compare = less<_Key>>
+      using set = std::set<_Key, _Compare, polymorphic_allocator<_Key>>;
 
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace pmr
+    template<typename _Key, typename _Compare = less<_Key>>
+      using multiset = std::multiset<_Key, _Compare,
+                                    polymorphic_allocator<_Key>>;
+  } // namespace pmr
 
 } // namespace fundamentals_v2
 } // namespace experimental
+
+_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
 #endif // C++14