unordered_map_adaptor

morzhovets · morzhovets · commit 7c50208d0ef5 · 2026-04-18T18:42:29.000+04:00
diff --git a/test/sources/libcxx11/unord.map/unord.map.cnstr/deduct.pass.cpp b/test/sources/libcxx11/unord.map/unord.map.cnstr/deduct.pass.cpp
@@ -143,11 +143,13 @@ void main()
     assert(m.size() == 0);
     }
 
+#if !(defined(TEST_GCC) && __GNUC__ < 13)
     {
     LIBCXX_TEST_CLASS m { P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} };
     ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);
     assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));
     }
+#endif
 
     {
     LIBCXX_TEST_CLASS m({ P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} }, 42);
diff --git a/test/sources/libcxx11/unord.map/unord.map.cnstr/deduct_const.pass.cpp b/test/sources/libcxx11/unord.map/unord.map.cnstr/deduct_const.pass.cpp
@@ -111,11 +111,13 @@ void main()
     assert(m.get_allocator().get_id() == 41);
     }
 
+#if !(defined(TEST_GCC) && __GNUC__ < 13)
     {
     LIBCXX_TEST_CLASS m { PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} };
     ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);
     assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));
     }
+#endif
 
     {
     LIBCXX_TEST_CLASS m({ PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} }, 42);
diff --git a/test/sources/libcxx20/unord.map/unord.map.cnstr/deduct.pass.cpp b/test/sources/libcxx20/unord.map/unord.map.cnstr/deduct.pass.cpp
@@ -156,11 +156,13 @@ int main(int, char**)
     assert(m.size() == 0);
     }
 
+#if !(defined(TEST_GCC) && __GNUC__ < 13)
     {
     LIBCXX_TEST_CLASS m { P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} };
     ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);
     assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));
     }
+#endif
 
     {
     LIBCXX_TEST_CLASS m({ P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} }, 42);
@@ -217,6 +219,7 @@ int main(int, char**)
     assert(m.get_allocator().get_id() == 48);
     }
 
+#if !(defined(TEST_GCC) && __GNUC__ < 13)
     {
     // Examples from LWG3025
     LIBCXX_TEST_CLASS m{std::pair{1, 1}, {2, 2}, {3, 3}};
@@ -225,6 +228,7 @@ int main(int, char**)
     LIBCXX_TEST_CLASS m2{m.begin(), m.end()};
     ASSERT_SAME_TYPE(decltype(m2), LIBCXX_TEST_CLASS<int, int>);
     }
+#endif
 
     {
     // Examples from LWG3531
diff --git a/test/sources/libcxx20/unord.map/unord.map.cnstr/deduct_const.pass.cpp b/test/sources/libcxx20/unord.map/unord.map.cnstr/deduct_const.pass.cpp
@@ -102,11 +102,13 @@ int main(int, char**)
     assert(m.get_allocator().get_id() == 41);
     }
 
+#if !(defined(TEST_GCC) && __GNUC__ < 13)
     {
     LIBCXX_TEST_CLASS m { PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} };
     ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);
     assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));
     }
+#endif
 
     {
     LIBCXX_TEST_CLASS m({ PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} }, 42);

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,13 @@ void main()`
`143`	`143`	`assert(m.size() == 0);`
`144`	`144`	`}`
`145`	`145`
	`146`	`+#if !(defined(TEST_GCC) && __GNUC__ < 13)`
`146`	`147`	`{`
`147`	`148`	`LIBCXX_TEST_CLASS m { P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} };`
`148`	`149`	`ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);`
`149`	`150`	`assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));`
`150`	`151`	`}`
	`152`	`+#endif`
`151`	`153`
`152`	`154`	`{`
`153`	`155`	`LIBCXX_TEST_CLASS m({ P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} }, 42);`
Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,13 @@ void main()`
`111`	`111`	`assert(m.get_allocator().get_id() == 41);`
`112`	`112`	`}`
`113`	`113`
	`114`	`+#if !(defined(TEST_GCC) && __GNUC__ < 13)`
`114`	`115`	`{`
`115`	`116`	`LIBCXX_TEST_CLASS m { PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} };`
`116`	`117`	`ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);`
`117`	`118`	`assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));`
`118`	`119`	`}`
	`120`	`+#endif`
`119`	`121`
`120`	`122`	`{`
`121`	`123`	`LIBCXX_TEST_CLASS m({ PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} }, 42);`
Original file line number	Diff line number	Diff line change
`@@ -156,11 +156,13 @@ int main(int, char**)`
`156`	`156`	`assert(m.size() == 0);`
`157`	`157`	`}`
`158`	`158`
	`159`	`+#if !(defined(TEST_GCC) && __GNUC__ < 13)`
`159`	`160`	`{`
`160`	`161`	`LIBCXX_TEST_CLASS m { P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} };`
`161`	`162`	`ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);`
`162`	`163`	`assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));`
`163`	`164`	`}`
	`165`	`+#endif`
`164`	`166`
`165`	`167`	`{`
`166`	`168`	`LIBCXX_TEST_CLASS m({ P{1,1L}, P{2,2L}, P{1,1L}, P{INT_MAX,1L}, P{3,1L} }, 42);`
`@@ -217,6 +219,7 @@ int main(int, char**)`
`217`	`219`	`assert(m.get_allocator().get_id() == 48);`
`218`	`220`	`}`
`219`	`221`
	`222`	`+#if !(defined(TEST_GCC) && __GNUC__ < 13)`
`220`	`223`	`{`
`221`	`224`	`// Examples from LWG3025`
`222`	`225`	`LIBCXX_TEST_CLASS m{std::pair{1, 1}, {2, 2}, {3, 3}};`
`@@ -225,6 +228,7 @@ int main(int, char**)`
`225`	`228`	`LIBCXX_TEST_CLASS m2{m.begin(), m.end()};`
`226`	`229`	`ASSERT_SAME_TYPE(decltype(m2), LIBCXX_TEST_CLASS<int, int>);`
`227`	`230`	`}`
	`231`	`+#endif`
`228`	`232`
`229`	`233`	`{`
`230`	`234`	`// Examples from LWG3531`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,13 @@ int main(int, char**)`
`102`	`102`	`assert(m.get_allocator().get_id() == 41);`
`103`	`103`	`}`
`104`	`104`
	`105`	`+#if !(defined(TEST_GCC) && __GNUC__ < 13)`
`105`	`106`	`{`
`106`	`107`	`LIBCXX_TEST_CLASS m { PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} };`
`107`	`108`	`ASSERT_SAME_TYPE(decltype(m), LIBCXX_TEST_CLASS<int, long>);`
`108`	`109`	`assert(std::is_permutation(m.begin(), m.end(), std::begin(expected_m), std::end(expected_m)));`
`109`	`110`	`}`
	`111`	`+#endif`
`110`	`112`
`111`	`113`	`{`
`112`	`114`	`LIBCXX_TEST_CLASS m({ PC{1,1L}, PC{2,2L}, PC{1,1L}, PC{INT_MAX,1L}, PC{3,1L} }, 42);`