Update libcxx/map

morzhovets · Nov 27, 2023 · 6d9aa4b · 6d9aa4b
1 parent 8c4cff4
commit 6d9aa4b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/test/sources/LibcxxTreeMapTester.cpp b/test/sources/LibcxxTreeMapTester.cpp
@@ -38,8 +38,6 @@ namespace std
 			momo::TreeMapSettings>>;
 }
 
-using std::map;
-
 #define LIBCXX_TEST_PREFIX "libcxx_test_tree_map"
 #include "LibcxxMapTests.h"
 #undef LIBCXX_TEST_PREFIX
@@ -64,8 +62,6 @@ namespace std
 			momo::TreeMapSettings>>;
 }
 
-using std::map;
-
 #define LIBCXX_TEST_PREFIX "libcxx_test_tree_map_vp"
 #include "LibcxxMapTests.h"
 #undef LIBCXX_TEST_PREFIX

diff --git a/test/sources/libcxx/map/map.cons/move_alloc.pass.cpp b/test/sources/libcxx/map/map.cons/move_alloc.pass.cpp
@@ -144,9 +144,9 @@ int main(int, char**)
         typedef test_allocator<VC> A;
         typedef std::less<int> C;
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        typedef map<const int, T, C, A> M;
+        typedef std::map<const int, T, C, A> M;
 #else
-        typedef map<int, T, C, A> M;
+        typedef std::map<int, T, C, A> M;
 #endif
         typedef V* I;
         Counter_base::gConstructed = 0;

diff --git a/test/sources/libcxx/map/map.modifiers/merge.pass.cpp b/test/sources/libcxx/map/map.modifiers/merge.pass.cpp
@@ -32,7 +32,7 @@ template<typename TKey, typename TMapped,
 using multimap = momo::stdish::multimap<TKey, TMapped, TLessFunc, TAllocator,
 	momo::TreeMap<TKey, TMapped, momo::TreeTraitsStd<TKey, TLessFunc, true>,
 		momo::MemManagerStd<TAllocator>,
-		typename map<TKey, TMapped, TLessFunc, TAllocator>::nested_container_type::KeyValueTraits>>;
+		typename std::map<TKey, TMapped, TLessFunc, TAllocator>::nested_container_type::KeyValueTraits>>;
 
 template <class Map>
 bool map_equal(const Map& map, Map other)