Make memory_resource implementation binary compatible with libstdc++ and Microsoft STL

libcxx/include/__fwd/memory_resource.h

@@ -15,13 +15,13 @@
 #  pragma GCC system_header
 #endif
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std { // purposefully not using versioning namespace
 
 namespace pmr {
 template <class _ValueType>
 class _LIBCPP_TEMPLATE_VIS polymorphic_allocator;
 } // namespace pmr
 
-_LIBCPP_END_NAMESPACE_STD
+} // namespace std
 
 #endif // _LIBCPP___FWD_MEMORY_RESOURCE_H

libcxx/include/__fwd/string.h

@@ -59,7 +59,11 @@ using u32string = basic_string<char32_t>;
 
 #if _LIBCPP_STD_VER >= 17
 
+_LIBCPP_END_NAMESPACE_STD
+
+namespace std {
 namespace pmr {
+
 template <class _CharT, class _Traits = char_traits<_CharT>>
 using basic_string = std::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>;
 
@@ -77,6 +81,9 @@ using u16string = basic_string<char16_t>;
 using u32string = basic_string<char32_t>;
 
 } // namespace pmr
+} // namespace std
+
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 

libcxx/include/__memory_resource/memory_resource.h

@@ -18,7 +18,7 @@
 
 #if _LIBCPP_STD_VER > 14
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std { // purposefully not using versioning namespace
 
 namespace pmr {
 
@@ -68,7 +68,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const memory_resource& __lhs, const
 
 } // namespace pmr
 
-_LIBCPP_END_NAMESPACE_STD
+} // namespace std
 
 #endif // _LIBCPP_STD_VER > 14
 

libcxx/include/__memory_resource/monotonic_buffer_resource.h

@@ -20,7 +20,7 @@
 
 #if _LIBCPP_STD_VER > 14
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std { // purposefully not using versioning namespace
 
 namespace pmr {
 
@@ -112,7 +112,7 @@ class _LIBCPP_TYPE_VIS monotonic_buffer_resource : public memory_resource {
 
 } // namespace pmr
 
-_LIBCPP_END_NAMESPACE_STD
+} // namespace std
 
 #endif // _LIBCPP_STD_VER > 14
 

libcxx/include/__memory_resource/polymorphic_allocator.h

@@ -28,7 +28,7 @@ _LIBCPP_PUSH_MACROS
 
 #if _LIBCPP_STD_VER > 14
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std { // purposefully not using versioning namespace
 
 namespace pmr {
 
@@ -215,7 +215,7 @@ operator!=(const polymorphic_allocator<_Tp>& __lhs, const polymorphic_allocator<
 
 } // namespace pmr
 
-_LIBCPP_END_NAMESPACE_STD
+} // namespace std
 
 #endif // _LIBCPP_STD_VER > 14
 

libcxx/include/__memory_resource/pool_options.h

@@ -18,7 +18,7 @@
 
 #if _LIBCPP_STD_VER > 14
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std { // purposefully not using versioning namespace
 
 namespace pmr {
 
@@ -31,7 +31,7 @@ struct _LIBCPP_TYPE_VIS pool_options {
 
 } // namespace pmr
 
-_LIBCPP_END_NAMESPACE_STD
+} // namespace std
 
 #endif // _LIBCPP_STD_VER > 14
 

libcxx/include/__memory_resource/synchronized_pool_resource.h

@@ -24,7 +24,7 @@
 
 #if _LIBCPP_STD_VER > 14
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std { // purposefully not using versioning namespace
 
 namespace pmr {
 
@@ -87,7 +87,7 @@ class _LIBCPP_TYPE_VIS synchronized_pool_resource : public memory_resource {
 
 } // namespace pmr
 
-_LIBCPP_END_NAMESPACE_STD
+} // namespace std
 
 #endif // _LIBCPP_STD_VER > 14
 

libcxx/include/__memory_resource/unsynchronized_pool_resource.h

@@ -21,7 +21,7 @@
 
 #if _LIBCPP_STD_VER > 14
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std { // purposefully not using versioning namespace
 
 namespace pmr {
 
@@ -99,7 +99,7 @@ class _LIBCPP_TYPE_VIS unsynchronized_pool_resource : public memory_resource {
 
 } // namespace pmr
 
-_LIBCPP_END_NAMESPACE_STD
+} // namespace std
 
 #endif // _LIBCPP_STD_VER > 14
 

libcxx/include/deque

@@ -2932,12 +2932,15 @@ inline constexpr bool __format::__enable_insertable<std::deque<wchar_t>> = true;
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std {
+
 namespace pmr {
 template <class _ValueT>
 using deque = std::deque<_ValueT, polymorphic_allocator<_ValueT>>;
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 _LIBCPP_POP_MACROS

libcxx/include/forward_list

@@ -1780,12 +1780,16 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace std {
+
 namespace pmr {
 template <class _ValueT>
 using forward_list = std::forward_list<_ValueT, polymorphic_allocator<_ValueT>>;
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 _LIBCPP_POP_MACROS

libcxx/include/list

@@ -2363,12 +2363,16 @@ inline constexpr bool __format::__enable_insertable<std::list<wchar_t>> = true;
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace std {
+
 namespace pmr {
 template <class _ValueT>
 using list = std::list<_ValueT, polymorphic_allocator<_ValueT>>;
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 _LIBCPP_POP_MACROS

libcxx/include/map

@@ -2340,15 +2340,19 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace std {
+
 namespace pmr {
 template <class _KeyT, class _ValueT, class _CompareT = std::less<_KeyT>>
 using map = std::map<_KeyT, _ValueT, _CompareT, polymorphic_allocator<std::pair<const _KeyT, _ValueT>>>;
 
 template <class _KeyT, class _ValueT, class _CompareT = std::less<_KeyT>>
 using multimap = std::multimap<_KeyT, _ValueT, _CompareT, polymorphic_allocator<std::pair<const _KeyT, _ValueT>>>;
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20

libcxx/include/regex

@@ -6845,7 +6845,9 @@ regex_replace(const _CharT* __s,
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace std {
+
 namespace pmr {
 template <class _BidirT>
 using match_results = std::match_results<_BidirT, polymorphic_allocator<std::sub_match<_BidirT>>>;
@@ -6858,7 +6860,9 @@ using wcmatch = match_results<const wchar_t*>;
 using wsmatch = match_results<std::pmr::wstring::const_iterator>;
 #endif
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 _LIBCPP_POP_MACROS

libcxx/include/set

@@ -1585,15 +1585,19 @@ inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace std {
+
 namespace pmr {
 template <class _KeyT, class _CompareT = std::less<_KeyT>>
 using set = std::set<_KeyT, _CompareT, polymorphic_allocator<_KeyT>>;
 
 template <class _KeyT, class _CompareT = std::less<_KeyT>>
 using multiset = std::multiset<_KeyT, _CompareT, polymorphic_allocator<_KeyT>>;
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20

libcxx/include/unordered_map

@@ -2630,7 +2630,9 @@ operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace std {
+
 namespace pmr {
 template <class _KeyT, class _ValueT, class _HashT = std::hash<_KeyT>, class _PredT = std::equal_to<_KeyT>>
 using unordered_map =
@@ -2640,7 +2642,9 @@ template <class _KeyT, class _ValueT, class _HashT = std::hash<_KeyT>, class _Pr
 using unordered_multimap =
     std::unordered_multimap<_KeyT, _ValueT, _HashT, _PredT, polymorphic_allocator<std::pair<const _KeyT, _ValueT>>>;
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20

libcxx/include/unordered_set

@@ -1804,15 +1804,19 @@ operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace std {
+
 namespace pmr {
 template <class _KeyT, class _HashT = std::hash<_KeyT>, class _PredT = std::equal_to<_KeyT>>
 using unordered_set = std::unordered_set<_KeyT, _HashT, _PredT, polymorphic_allocator<_KeyT>>;
 
 template <class _KeyT, class _HashT = std::hash<_KeyT>, class _PredT = std::equal_to<_KeyT>>
 using unordered_multiset = std::unordered_multiset<_KeyT, _HashT, _PredT, polymorphic_allocator<_KeyT>>;
 } // namespace pmr
-_LIBCPP_END_NAMESPACE_STD
+
+} // namespace std
+
 #endif
 
 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20

libcxx/include/vector

@@ -3315,11 +3315,15 @@ inline constexpr bool __format::__enable_insertable<std::vector<wchar_t>> = true
 _LIBCPP_END_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 14
-_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std {
+
 namespace pmr {
 template <class _ValueT>
 using vector = std::vector<_ValueT, polymorphic_allocator<_ValueT>>;
 } // namespace pmr
+
+} // namespace std
+
 _LIBCPP_END_NAMESPACE_STD
 #endif