diff options
Diffstat (limited to 'libcxx/test/std/containers/associative/map')
22 files changed, 53 insertions, 31 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.access/iterator.pass.cpp b/libcxx/test/std/containers/associative/map/map.access/iterator.pass.cpp index 4f66eb6a8e3..26d51f39ee1 100644 --- a/libcxx/test/std/containers/associative/map/map.access/iterator.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.access/iterator.pass.cpp @@ -29,6 +29,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -207,7 +208,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::map<int, double> C; C::iterator ii1{}, ii2{}; diff --git a/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp index 6bad75d66f1..705fb580487 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp @@ -18,6 +18,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" @@ -75,7 +76,7 @@ int main() assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin(), 2) == V(3, 1)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; V ar[] = diff --git a/libcxx/test/std/containers/associative/map/map.ops/count.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/count.pass.cpp index f3df31951c7..c35ad3f0a00 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/count.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/count.pass.cpp @@ -16,6 +16,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -98,7 +99,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::map<int, double, std::less <>> M; diff --git a/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp index 075a5ba2e0a..bd0bf2ec4a0 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().count(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp index de189902180..ff4bed8cb60 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().count(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp index b139689fec7..55a463ed38a 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().count(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range.pass.cpp index 8beeb8b30f5..28747063a30 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/equal_range.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range.pass.cpp @@ -17,6 +17,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -297,7 +298,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::map<int, double, std::less<>> M; diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp index c66c2c51214..a92ad96921c 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().equal_range(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp index 85083d4f479..23357e26897 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().equal_range(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp index c9f1126e5ba..3ffa3f22a61 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().equal_range(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/find.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/find.pass.cpp index 225f0f40604..b23d303df55 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/find.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/find.pass.cpp @@ -17,6 +17,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -165,7 +166,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::map<int, double, std::less<>> M; diff --git a/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp index 4fe61117613..5346821b42a 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().find(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp index 3532dc8765b..1dfb7fa44b0 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().find(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp index be77330a29c..f5e92b8264b 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else @@ -36,4 +37,4 @@ int main() M().find(C2Int{5}); } } -#endif
\ No newline at end of file +#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp index e4359fa548b..9c63dc7ab3a 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp @@ -17,6 +17,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -229,7 +230,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::map<int, double, std::less <>> M; diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp index 97bbf553205..6a3ed96a4fc 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp index eeae8e65738..87fffe7afcc 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp index ba27ae3c517..fbccd3ab221 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp index 8c721947a2c..7276b74b193 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp @@ -17,6 +17,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -228,7 +229,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::map<int, double, std::less<>> M; diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp index 6568e04bfad..cb23588e2b9 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp index bbb857e6f25..1fa4cbc7001 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp index ed9a41e4f03..0f3cea23829 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp @@ -22,9 +22,10 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "is_transparent.h" -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 #error "This test requires is C++14 (or later)" #else |
