diff options
author | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-11-04 20:26:59 +0000 |
---|---|---|
committer | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-11-04 20:26:59 +0000 |
commit | e619862dbf0c4a46db6e3d816bcafcfef6e85977 (patch) | |
tree | 4213e683d62c9bd7a19c43b5188a92c2f05b2194 | |
parent | f333beee2ce44299b1ce219371bdef60290ac175 (diff) | |
download | external_libcxx-e619862dbf0c4a46db6e3d816bcafcfef6e85977.tar.gz external_libcxx-e619862dbf0c4a46db6e3d816bcafcfef6e85977.tar.bz2 external_libcxx-e619862dbf0c4a46db6e3d816bcafcfef6e85977.zip |
[libcxx] [test] Replace _LIBCPP_STD_VER with TEST_STD_VER.
This replaces every occurrence of _LIBCPP_STD_VER in the tests with
TEST_STD_VER. Additionally, for every affected
file, #include "test_macros.h" is being added explicitly if it wasn't
already there.
https://reviews.llvm.org/D26294
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@286007 91177308-0d34-0410-b5e6-96231b3b80d8
252 files changed, 606 insertions, 314 deletions
diff --git a/test/std/containers/associative/map/map.access/iterator.pass.cpp b/test/std/containers/associative/map/map.access/iterator.pass.cpp index 4f66eb6a8..26d51f39e 100644 --- a/test/std/containers/associative/map/map.access/iterator.pass.cpp +++ b/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/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp index 6bad75d66..705fb5804 100644 --- a/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp +++ b/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/test/std/containers/associative/map/map.ops/count.pass.cpp b/test/std/containers/associative/map/map.ops/count.pass.cpp index f3df31951..c35ad3f0a 100644 --- a/test/std/containers/associative/map/map.ops/count.pass.cpp +++ b/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/test/std/containers/associative/map/map.ops/count1.fail.cpp b/test/std/containers/associative/map/map.ops/count1.fail.cpp index 075a5ba2e..bd0bf2ec4 100644 --- a/test/std/containers/associative/map/map.ops/count1.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/count2.fail.cpp b/test/std/containers/associative/map/map.ops/count2.fail.cpp index de1899021..ff4bed8cb 100644 --- a/test/std/containers/associative/map/map.ops/count2.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/count3.fail.cpp b/test/std/containers/associative/map/map.ops/count3.fail.cpp index b139689fe..55a463ed3 100644 --- a/test/std/containers/associative/map/map.ops/count3.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/equal_range.pass.cpp b/test/std/containers/associative/map/map.ops/equal_range.pass.cpp index 8beeb8b30..28747063a 100644 --- a/test/std/containers/associative/map/map.ops/equal_range.pass.cpp +++ b/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/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp b/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp index c66c2c512..a92ad9692 100644 --- a/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp b/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp index 85083d4f4..23357e268 100644 --- a/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp b/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp index c9f1126e5..3ffa3f22a 100644 --- a/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/find.pass.cpp b/test/std/containers/associative/map/map.ops/find.pass.cpp index 225f0f406..b23d303df 100644 --- a/test/std/containers/associative/map/map.ops/find.pass.cpp +++ b/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/test/std/containers/associative/map/map.ops/find1.fail.cpp b/test/std/containers/associative/map/map.ops/find1.fail.cpp index 4fe611176..5346821b4 100644 --- a/test/std/containers/associative/map/map.ops/find1.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/find2.fail.cpp b/test/std/containers/associative/map/map.ops/find2.fail.cpp index 3532dc876..1dfb7fa44 100644 --- a/test/std/containers/associative/map/map.ops/find2.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/find3.fail.cpp b/test/std/containers/associative/map/map.ops/find3.fail.cpp index be77330a2..f5e92b826 100644 --- a/test/std/containers/associative/map/map.ops/find3.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp b/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp index e4359fa54..9c63dc7ab 100644 --- a/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp +++ b/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/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp b/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp index 97bbf5532..6a3ed96a4 100644 --- a/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp b/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp index eeae8e657..87fffe7af 100644 --- a/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp b/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp index ba27ae3c5..fbccd3ab2 100644 --- a/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp b/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp index 8c721947a..7276b74b1 100644 --- a/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp +++ b/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/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp b/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp index 6568e04bf..cb23588e2 100644 --- a/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp b/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp index bbb857e6f..1fa4cbc70 100644 --- a/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp +++ b/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/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp b/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp index ed9a41e4f..0f3cea238 100644 --- a/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp +++ b/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 diff --git a/test/std/containers/associative/multimap/iterator.pass.cpp b/test/std/containers/associative/multimap/iterator.pass.cpp index ef7c5ef18..5f38e926a 100644 --- a/test/std/containers/associative/multimap/iterator.pass.cpp +++ b/test/std/containers/associative/multimap/iterator.pass.cpp @@ -29,6 +29,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -211,7 +212,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::multimap<int, double> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp b/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp index 46c56aa0b..de6d97dbc 100644 --- a/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp @@ -17,6 +17,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -76,7 +77,7 @@ int main() assert(*next(m.begin(), 7) == V(3, 1.5)); assert(*next(m.begin(), 8) == V(3, 2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; V ar[] = diff --git a/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp b/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp index 92f90f551..7fb2a90a5 100644 --- a/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.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" @@ -92,7 +93,7 @@ int main() } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::multimap<int, double, std::less<>> M; typedef M::size_type R; diff --git a/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp index d0f3f1c0f..70464b12c 100644 --- a/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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 @@ -34,4 +35,4 @@ int main() M().count(C2Int{5}); } -#endif
\ No newline at end of file +#endif diff --git a/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp index 86d492f7f..ad15ff441 100644 --- a/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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 @@ -34,4 +35,4 @@ int main() M().count(C2Int{5}); } -#endif
\ No newline at end of file +#endif diff --git a/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp index 55095efb3..5e6c9ab6f 100644 --- a/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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 @@ -34,4 +35,4 @@ int main() M().count(C2Int{5}); } -#endif
\ No newline at end of file +#endif diff --git a/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp b/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp index 31eac2681..df46d376e 100644 --- a/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.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" @@ -180,7 +181,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::multimap<int, double, std::less<>> M; diff --git a/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp index f793bf885..a339467f7 100644 --- a/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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 @@ -34,4 +35,4 @@ int main() M().equal_range(C2Int{5}); } -#endif
\ No newline at end of file +#endif diff --git a/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp index d099a8c81..633e0615b 100644 --- a/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp index e53fff942..34b1b4b77 100644 --- a/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp b/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp index 2fd8c05b5..f5295e52d 100644 --- a/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.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" @@ -144,7 +145,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::multimap<int, double, std::less<>> M; diff --git a/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp index 2759af46b..bc3593292 100644 --- a/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp index c67f3b39d..254f524af 100644 --- a/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp index e53fc4d55..2805f4759 100644 --- a/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp b/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp index 5c0315f95..8a650fa55 100644 --- a/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.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" @@ -152,7 +153,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::multimap<int, double, std::less<>> M; diff --git a/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp index 9b39573a5..4b0db4787 100644 --- a/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp index 68710bd1b..300364cff 100644 --- a/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp index f254ef478..09963096f 100644 --- a/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp b/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp index 012354cef..05760dc0e 100644 --- a/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.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" #include "is_transparent.h" @@ -152,7 +153,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<const int, double> V; typedef std::multimap<int, double, std::less<>> M; diff --git a/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp index d47d7bfc8..10e59c5e5 100644 --- a/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp index a3da9d82c..81ebbb832 100644 --- a/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp b/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp index 6ffdb206c..fe4131524 100644 --- a/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp +++ b/test/std/containers/associative/multimap/multimap.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 diff --git a/test/std/containers/associative/multiset/count.pass.cpp b/test/std/containers/associative/multiset/count.pass.cpp index 997a94938..863da792a 100644 --- a/test/std/containers/associative/multiset/count.pass.cpp +++ b/test/std/containers/associative/multiset/count.pass.cpp @@ -16,6 +16,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -91,7 +92,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset<int, std::less<>> M; diff --git a/test/std/containers/associative/multiset/equal_range.pass.cpp b/test/std/containers/associative/multiset/equal_range.pass.cpp index 7ab95cfb8..1a3beebcf 100644 --- a/test/std/containers/associative/multiset/equal_range.pass.cpp +++ b/test/std/containers/associative/multiset/equal_range.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -180,7 +181,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset<V, std::less<>> M; diff --git a/test/std/containers/associative/multiset/find.pass.cpp b/test/std/containers/associative/multiset/find.pass.cpp index 3b7d96fe9..e20f4f8ce 100644 --- a/test/std/containers/associative/multiset/find.pass.cpp +++ b/test/std/containers/associative/multiset/find.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -164,7 +165,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset<V, std::less<>> M; diff --git a/test/std/containers/associative/multiset/iterator.pass.cpp b/test/std/containers/associative/multiset/iterator.pass.cpp index c152a4398..b727345f1 100644 --- a/test/std/containers/associative/multiset/iterator.pass.cpp +++ b/test/std/containers/associative/multiset/iterator.pass.cpp @@ -29,6 +29,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -195,7 +196,7 @@ int main() assert(*i == j); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::multiset<int> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/associative/multiset/lower_bound.pass.cpp b/test/std/containers/associative/multiset/lower_bound.pass.cpp index ae8cfe6ef..f5ce8e533 100644 --- a/test/std/containers/associative/multiset/lower_bound.pass.cpp +++ b/test/std/containers/associative/multiset/lower_bound.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -152,7 +153,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset<V, std::less<>> M; diff --git a/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp index 7327bf626..b3d6066eb 100644 --- a/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp @@ -16,6 +16,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -51,7 +52,7 @@ int main() assert(*++i == V(5)); assert(*++i == V(6)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::multiset<int, std::less<int>, min_allocator<int>> C; typedef C::value_type V; diff --git a/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp index 4313f46a0..8a6cf4541 100644 --- a/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp @@ -18,6 +18,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -57,7 +58,7 @@ int main() assert(*next(m.begin(), 7) == 3); assert(*next(m.begin(), 8) == 3); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; V ar[] = diff --git a/test/std/containers/associative/multiset/upper_bound.pass.cpp b/test/std/containers/associative/multiset/upper_bound.pass.cpp index 7bb0c3cb4..8bd00e2f3 100644 --- a/test/std/containers/associative/multiset/upper_bound.pass.cpp +++ b/test/std/containers/associative/multiset/upper_bound.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -152,7 +153,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset<V, std::less<>> M; diff --git a/test/std/containers/associative/set/count.pass.cpp b/test/std/containers/associative/set/count.pass.cpp index ddc913910..dd75651c0 100644 --- a/test/std/containers/associative/set/count.pass.cpp +++ b/test/std/containers/associative/set/count.pass.cpp @@ -16,6 +16,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -93,7 +94,7 @@ int main() assert(r == 0); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set<int, std::less<>> M; diff --git a/test/std/containers/associative/set/equal_range.pass.cpp b/test/std/containers/associative/set/equal_range.pass.cpp index ed41f691a..53fe895bd 100644 --- a/test/std/containers/associative/set/equal_range.pass.cpp +++ b/test/std/containers/associative/set/equal_range.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -228,7 +229,7 @@ int main() assert(r.second == next(m.begin(), 8)); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set<V, std::less<>> M; diff --git a/test/std/containers/associative/set/find.pass.cpp b/test/std/containers/associative/set/find.pass.cpp index 60f16fcd6..fa1e54740 100644 --- a/test/std/containers/associative/set/find.pass.cpp +++ b/test/std/containers/associative/set/find.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -164,7 +165,7 @@ int main() } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set<V, std::less<>> M; diff --git a/test/std/containers/associative/set/iterator.pass.cpp b/test/std/containers/associative/set/iterator.pass.cpp index c318341ce..6636454af 100644 --- a/test/std/containers/associative/set/iterator.pass.cpp +++ b/test/std/containers/associative/set/iterator.pass.cpp @@ -29,6 +29,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -191,7 +192,7 @@ int main() assert(*i == j); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::set<int> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/associative/set/lower_bound.pass.cpp b/test/std/containers/associative/set/lower_bound.pass.cpp index 55d49a097..8dfe537b2 100644 --- a/test/std/containers/associative/set/lower_bound.pass.cpp +++ b/test/std/containers/associative/set/lower_bound.pass.cpp @@ -17,6 +17,7 @@ #include <set> #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 int V; typedef std::set<V, std::less<>> M; diff --git a/test/std/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/test/std/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp index 821820a1e..80d41b0b5 100644 --- a/test/std/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp +++ b/test/std/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp @@ -16,6 +16,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -40,7 +41,7 @@ int main() assert(m.key_comp() == Cmp(10)); assert(m.get_allocator() == A(4)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef test_compare<std::less<int> > Cmp; typedef test_allocator<int> A; diff --git a/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp index 077a749ca..13eccbe2a 100644 --- a/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp +++ b/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp @@ -22,6 +22,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -55,7 +56,7 @@ int main() assert(*next(m.begin()) == 2); assert(*next(m.begin(), 2) == 3); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; V ar[] = diff --git a/test/std/containers/associative/set/upper_bound.pass.cpp b/test/std/containers/associative/set/upper_bound.pass.cpp index 9d4ab2805..bafb4377f 100644 --- a/test/std/containers/associative/set/upper_bound.pass.cpp +++ b/test/std/containers/associative/set/upper_bound.pass.cpp @@ -17,6 +17,7 @@ #include <set> #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 int V; typedef std::set<V, std::less<>> M; diff --git a/test/std/containers/sequences/array/iterators.pass.cpp b/test/std/containers/sequences/array/iterators.pass.cpp index 233e9328c..1f9904e1f 100644 --- a/test/std/containers/sequences/array/iterators.pass.cpp +++ b/test/std/containers/sequences/array/iterators.pass.cpp @@ -15,6 +15,8 @@ #include <iterator> #include <cassert> +#include "test_macros.h" + int main() { { @@ -36,7 +38,7 @@ int main() assert(i == j); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing { typedef std::array<int, 5> C; diff --git a/test/std/containers/sequences/deque/deque.cons/size.pass.cpp b/test/std/containers/sequences/deque/deque.cons/size.pass.cpp index e766b45da..94f758472 100644 --- a/test/std/containers/sequences/deque/deque.cons/size.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/size.pass.cpp @@ -14,6 +14,7 @@ #include <deque> #include <cassert> +#include "test_macros.h" #include "test_allocator.h" #include "DefaultOnly.h" #include "min_allocator.h" @@ -22,7 +23,7 @@ template <class T, class Allocator> void test2(unsigned n) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::deque<T, Allocator> C; typedef typename C::const_iterator const_iterator; assert(DefaultOnly::count == 0); @@ -64,7 +65,7 @@ template <class T, class Allocator> void test3(unsigned n, Allocator const &alloc = Allocator()) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::deque<T, Allocator> C; typedef typename C::const_iterator const_iterator; { @@ -104,7 +105,7 @@ int main() test<DefaultOnly, min_allocator<DefaultOnly> >(4095); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 test3<DefaultOnly, std::allocator<DefaultOnly>> (1023); test3<int, std::allocator<int>>(1); test3<int, min_allocator<int>> (3); diff --git a/test/std/containers/sequences/deque/iterators.pass.cpp b/test/std/containers/sequences/deque/iterators.pass.cpp index 19d7996f8..5c7ae01e6 100644 --- a/test/std/containers/sequences/deque/iterators.pass.cpp +++ b/test/std/containers/sequences/deque/iterators.pass.cpp @@ -20,6 +20,7 @@ #include <iterator> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -44,7 +45,7 @@ int main() assert(i == j); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing std::deque<int>::iterator ii1{}, ii2{}; std::deque<int>::iterator ii4 = ii1; diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp index 736d59936..1db6127d0 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp @@ -15,13 +15,14 @@ #include <forward_list> #include <cassert> +#include "test_macros.h" #include "DefaultOnly.h" #include "min_allocator.h" template <class T, class Allocator> void check_allocator(unsigned n, Allocator const &alloc = Allocator()) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::forward_list<T, Allocator> C; C d(n, alloc); assert(d.get_allocator() == alloc); diff --git a/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp index 925cca4d5..d9daf87fb 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <iterator> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -120,7 +121,7 @@ int main() C::const_iterator j; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing std::forward_list<int>::iterator ii1{}, ii2{}; std::forward_list<int>::iterator ii4 = ii1; diff --git a/test/std/containers/sequences/list/iterators.pass.cpp b/test/std/containers/sequences/list/iterators.pass.cpp index fe0ac0799..ce1b770e4 100644 --- a/test/std/containers/sequences/list/iterators.pass.cpp +++ b/test/std/containers/sequences/list/iterators.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <iterator> +#include "test_macros.h" #include "min_allocator.h" struct A @@ -135,7 +136,7 @@ int main() assert(j->first == 3); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { std::list<int> c; std::list<int>::iterator ii1{}, ii2{}; diff --git a/test/std/containers/sequences/list/list.cons/size_type.pass.cpp b/test/std/containers/sequences/list/list.cons/size_type.pass.cpp index 317be0b24..ef9ce1750 100644 --- a/test/std/containers/sequences/list/list.cons/size_type.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/size_type.pass.cpp @@ -13,6 +13,7 @@ #include <list> #include <cassert> +#include "test_macros.h" #include "DefaultOnly.h" #include "test_allocator.h" #include "min_allocator.h" @@ -21,7 +22,7 @@ template <class T, class Allocator> void test3(unsigned n, Allocator const &alloc = Allocator()) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::list<T, Allocator> C; typedef typename C::const_iterator const_iterator; { @@ -59,7 +60,7 @@ int main() ++i; assert(*i == 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::list<int, min_allocator<int> > C; C l(3, min_allocator<int> ()); diff --git a/test/std/containers/sequences/vector.bool/iterators.pass.cpp b/test/std/containers/sequences/vector.bool/iterators.pass.cpp index 882ac9be4..10b96480a 100644 --- a/test/std/containers/sequences/vector.bool/iterators.pass.cpp +++ b/test/std/containers/sequences/vector.bool/iterators.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <iterator> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -94,7 +95,7 @@ int main() C::const_iterator j; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing std::vector<bool>::iterator ii1{}, ii2{}; std::vector<bool>::iterator ii4 = ii1; diff --git a/test/std/containers/sequences/vector/iterators.pass.cpp b/test/std/containers/sequences/vector/iterators.pass.cpp index 8dc14977f..a1ce2be32 100644 --- a/test/std/containers/sequences/vector/iterators.pass.cpp +++ b/test/std/containers/sequences/vector/iterators.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <iterator> +#include "test_macros.h" #include "min_allocator.h" struct A @@ -135,7 +136,7 @@ int main() assert(j->first == 3); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::vector<int> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/unord/unord.map/iterators.pass.cpp b/test/std/containers/unord/unord.map/iterators.pass.cpp index 31f4254ea..2554e93f0 100644 --- a/test/std/containers/unord/unord.map/iterators.pass.cpp +++ b/test/std/containers/unord/unord.map/iterators.pass.cpp @@ -24,6 +24,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -108,7 +109,7 @@ int main() C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_map<int,double> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp index e980b68b5..6249fb0f6 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -91,7 +92,7 @@ int main() assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<int, std::string> P; typedef test_allocator<std::pair<const int, std::string>> A; diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp index d2a18fa45..7c38ed619 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp @@ -21,6 +21,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -97,7 +98,7 @@ int main() assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<int, std::string> P; typedef test_allocator<std::pair<const int, std::string>> A; diff --git a/test/std/containers/unord/unord.multimap/iterators.pass.cpp b/test/std/containers/unord/unord.multimap/iterators.pass.cpp index cc75bb10a..14af93fec 100644 --- a/test/std/containers/unord/unord.multimap/iterators.pass.cpp +++ b/test/std/containers/unord/unord.multimap/iterators.pass.cpp @@ -24,6 +24,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -114,7 +115,7 @@ int main() C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_multimap<int,double> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp index 76a728e8d..19877738a 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp @@ -84,7 +84,7 @@ int main() assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef NotConstructible T; typedef test_allocator<std::pair<const T, T>> A; diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp index f6bc3a08c..486d9dfab 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -135,7 +136,7 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert((c.get_allocator() == min_allocator<std::pair<const int, std::string> >())); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<int, std::string> P; typedef test_allocator<std::pair<const int, std::string>> A; diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp index 96ad70a56..943b3a833 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp @@ -21,6 +21,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -141,7 +142,7 @@ int main() assert(c.key_eq() == test_compare<std::equal_to<int> >()); assert((c.get_allocator() == min_allocator<std::pair<const int, std::string> >())); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<int, std::string> P; typedef test_allocator<std::pair<const int, std::string>> A; diff --git a/test/std/containers/unord/unord.multiset/iterators.pass.cpp b/test/std/containers/unord/unord.multiset/iterators.pass.cpp index bf42740c2..70d0c5adf 100644 --- a/test/std/containers/unord/unord.multiset/iterators.pass.cpp +++ b/test/std/containers/unord/unord.multiset/iterators.pass.cpp @@ -23,6 +23,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -107,7 +108,7 @@ int main() C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_multiset<int> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp index 8e29aa002..867ca93fb 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp @@ -62,7 +62,7 @@ int main() assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef NotConstructible T; typedef test_hash<std::hash<T>> HF; diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp index 53a9003b0..e51955cb4 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp @@ -19,6 +19,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -88,7 +89,7 @@ int main() assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int T; typedef test_hash<std::hash<T>> HF; diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp index 12679ef3e..9c6f24126 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -93,7 +94,7 @@ int main() assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int T; typedef test_hash<std::hash<T>> HF; diff --git a/test/std/containers/unord/unord.set/iterators.pass.cpp b/test/std/containers/unord/unord.set/iterators.pass.cpp index 494411854..1eddc9038 100644 --- a/test/std/containers/unord/unord.set/iterators.pass.cpp +++ b/test/std/containers/unord/unord.set/iterators.pass.cpp @@ -23,6 +23,7 @@ #include <unordered_set> #include <cassert> +#include "test_macros.h" #include "min_allocator.h" int main() @@ -107,7 +108,7 @@ int main() C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_set<int> C; C::iterator ii1{}, ii2{}; diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp index 243037916..9cd03809d 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp @@ -62,7 +62,7 @@ int main() assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef NotConstructible T; typedef test_hash<std::hash<T>> HF; diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp index 3fd0c3926..088e61600 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp @@ -19,6 +19,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -88,7 +89,7 @@ int main() assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int T; typedef test_hash<std::hash<T>> HF; diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp index c978d8d5d..e10d32c5e 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp @@ -20,6 +20,7 @@ #include <cassert> #include <cfloat> +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -93,7 +94,7 @@ int main() assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int T; typedef test_hash<std::hash<T>> HF; diff --git a/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp b/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp index cddb27e93..ac7be156c 100644 --- a/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp +++ b/test/std/experimental/optional/optional.nullops/less_equal.pass.cpp @@ -15,9 +15,11 @@ #include <experimental/optional> +#include "test_macros.h" + int main() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 using std::experimental::optional; using std::experimental::nullopt_t; using std::experimental::nullopt; diff --git a/test/std/experimental/string.view/string.view.access/data.pass.cpp b/test/std/experimental/string.view/string.view.access/data.pass.cpp index 53e95ddae..4b581d653 100644 --- a/test/std/experimental/string.view/string.view.access/data.pass.cpp +++ b/test/std/experimental/string.view/string.view.access/data.pass.cpp @@ -39,7 +39,7 @@ int main () { test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char *s = "ABC"; constexpr std::experimental::basic_string_view<char> sv( s, 2 ); diff --git a/test/std/experimental/string.view/string.view.access/index.pass.cpp b/test/std/experimental/string.view/string.view.access/index.pass.cpp index 2c1bd1dc9..0cb385eef 100644 --- a/test/std/experimental/string.view/string.view.access/index.pass.cpp +++ b/test/std/experimental/string.view/string.view.access/index.pass.cpp @@ -42,7 +42,7 @@ int main () { test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::experimental::basic_string_view<char> sv ( "ABC", 2 ); static_assert ( sv.length() == 2, "" ); diff --git a/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp b/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp index 9f5d86f2f..a5108bf12 100644 --- a/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp +++ b/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp @@ -23,7 +23,7 @@ template<typename SV> void test1 () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr SV sv1; static_assert ( sv1.size() == 0, "" ); diff --git a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp index 0df37a6ff..bd566a986 100644 --- a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp index 5971f6974..51decdca6 100644 --- a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp index f5bcb7e97..cf8a30a39 100644 --- a/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp index e13a4ea11..1bacf285f 100644 --- a/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp index 63002a5c4..0aae3d41a 100644 --- a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp index 3047cc7be..e014872a6 100644 --- a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp index c542efea9..bdc4c966f 100644 --- a/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp index 17219a426..e814283ad 100644 --- a/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp index 2c0461481..10e82437c 100644 --- a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp index df9e90893..77d8fa3e5 100644 --- a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp index 1deee9ac7..9c13199d2 100644 --- a/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp index c99489eb3..c74b327f1 100644 --- a/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.cons/default.pass.cpp b/test/std/experimental/string.view/string.view.cons/default.pass.cpp index e817bfffb..37df020e7 100644 --- a/test/std/experimental/string.view/string.view.cons/default.pass.cpp +++ b/test/std/experimental/string.view/string.view.cons/default.pass.cpp @@ -15,9 +15,11 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" + template<typename T> void test () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T sv1; static_assert ( sv1.size() == 0, "" ); diff --git a/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp b/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp index 9de3a3039..a8638389e 100644 --- a/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp +++ b/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp @@ -18,6 +18,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template<typename CharT> @@ -55,7 +56,7 @@ int main () { test ( U"" ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::experimental::basic_string_view<char, constexpr_char_traits<char>> sv1 ( "ABCDE" ); static_assert ( sv1.size() == 5, ""); diff --git a/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp b/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp index 663d25e95..c2f312daa 100644 --- a/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp +++ b/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp @@ -34,7 +34,7 @@ int main () { test ( "QBCDE", 5 ); test ( "QBCDE", 2 ); test ( "", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char *s = "QBCDE"; constexpr std::experimental::basic_string_view<char> sv1 ( s, 2 ); @@ -46,7 +46,7 @@ int main () { test ( L"QBCDE", 5 ); test ( L"QBCDE", 2 ); test ( L"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const wchar_t *s = L"QBCDE"; constexpr std::experimental::basic_string_view<wchar_t> sv1 ( s, 2 ); @@ -59,7 +59,7 @@ int main () { test ( u"QBCDE", 5 ); test ( u"QBCDE", 2 ); test ( u"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char16_t *s = u"QBCDE"; constexpr std::experimental::basic_string_view<char16_t> sv1 ( s, 2 ); @@ -71,7 +71,7 @@ int main () { test ( U"QBCDE", 5 ); test ( U"QBCDE", 2 ); test ( U"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char32_t *s = U"QBCDE"; constexpr std::experimental::basic_string_view<char32_t> sv1 ( s, 2 ); diff --git a/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp index 6e6a1f557..fdaf8aa06 100644 --- a/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("abcdeabcdeabcdeabcde"), 'c', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp index 73580aed8..859980af2 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -68,7 +69,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'q', 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp index de93288cc..1f7ce3ef5 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp index cfb0029fa..28255dd45 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp index dde2f2c9f..ffafcfc04 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'e', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp index e49e82cca..7b37fe057 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp index 1dc8d8547..1f7ea383a 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp index ed1a35e91..307be2370 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'i', 19); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp index e07c4f361..b0d3f0636 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp index 3ddf03365..8a591ccbe 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp index d28e00795..b949eec1b 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'm', 15); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp index f01e277f5..3755b2653 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp index a38ffa692..64b29ec7d 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp index 5ebe414be..bdccb2f22 100644 --- a/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -155,7 +156,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp index 382cbaf07..856dc4a3a 100644 --- a/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp index 84132ac7a..f25efdd02 100644 --- a/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -148,7 +149,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp index 9014d888d..f07071101 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp @@ -13,6 +13,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -65,7 +66,7 @@ int main() test(S("abcdeabcdeabcdeabcde"), 'b', 16); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp index 0559d3121..7a8795be0 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp @@ -13,6 +13,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -155,7 +156,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp index 9116e3aa9..2755d2c56 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp @@ -13,6 +13,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -375,7 +376,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp index 88457c662..e77d668d7 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -148,7 +149,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp b/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp index 8040b81d4..5f28f63f8 100644 --- a/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp +++ b/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp @@ -58,7 +58,7 @@ int main() test(u32string_view{U"123"}); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr string_view sv { "123", 3 }; constexpr u16string_view u16sv {u"123", 3 }; diff --git a/test/std/experimental/string.view/string.view.iterators/end.pass.cpp b/test/std/experimental/string.view/string.view.iterators/end.pass.cpp index 3a1091e99..0eeafac49 100644 --- a/test/std/experimental/string.view/string.view.iterators/end.pass.cpp +++ b/test/std/experimental/string.view/string.view.iterators/end.pass.cpp @@ -66,7 +66,7 @@ int main() test(u32string_view{U"123"}); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr string_view sv { "123", 3 }; constexpr u16string_view u16sv {u"123", 3 }; diff --git a/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp index 9a4891c8f..00b0661d8 100644 --- a/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp @@ -32,7 +32,7 @@ void test ( const CharT *s, size_t len ) { } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -60,7 +60,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( test_ce (5) == 0, "" ); #endif diff --git a/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp index 4a31486af..03484a0b5 100644 --- a/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp @@ -39,7 +39,7 @@ void test ( const CharT *s, size_t len ) { } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce ( 5, 0 ) == 5, "" ); static_assert ( test_ce ( 5, 1 ) == 4, "" ); diff --git a/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp index 9ddc6de84..6b632d0ef 100644 --- a/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp @@ -39,7 +39,7 @@ void test ( const CharT *s, size_t len ) { } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce ( 5, 0 ) == 5, "" ); static_assert ( test_ce ( 5, 1 ) == 4, "" ); diff --git a/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp index d747def85..2912fd8b9 100644 --- a/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp @@ -36,7 +36,7 @@ void test ( const CharT *s, size_t len ) { } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -66,7 +66,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce (2, 3) == 3, "" ); static_assert ( test_ce (5, 3) == 3, "" ); diff --git a/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp b/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp index 6ba03212d..202e9ced4 100644 --- a/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp +++ b/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp @@ -16,7 +16,9 @@ #include <experimental/string_view> #include <cassert> -#if _LIBCPP_STD_VER > 11 +#include "test_macros.h" + +#if TEST_STD_VER > 11 // quoted is C++14 only bool is_skipws ( const std::istream *is ) { diff --git a/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp b/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp index 583395451..93014ea11 100644 --- a/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } @@ -112,7 +113,7 @@ int main() } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp b/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp index 4364ab063..ff01daaf1 100644 --- a/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp +++ b/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } @@ -106,7 +107,7 @@ int main () { test(U"abcdefghijklmnopqrst", U"abcdefghijklmnopqrst", 0); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1 { "abcde", 5 }; diff --git a/test/std/input.output/file.streams/c.files/cstdio.pass.cpp b/test/std/input.output/file.streams/c.files/cstdio.pass.cpp index 4c2be7d4a..5df8691ef 100644 --- a/test/std/input.output/file.streams/c.files/cstdio.pass.cpp +++ b/test/std/input.output/file.streams/c.files/cstdio.pass.cpp @@ -12,6 +12,8 @@ #include <cstdio> #include <type_traits> +#include "test_macros.h" + #ifndef BUFSIZ #error BUFSIZ not defined #endif @@ -140,7 +142,7 @@ int main() #ifndef _LIBCPP_HAS_NO_STDIN static_assert((std::is_same<decltype(std::getchar()), int>::value), ""); -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 static_assert((std::is_same<decltype(std::gets(cp)), char*>::value), ""); #endif static_assert((std::is_same<decltype(std::scanf(" ")), int>::value), ""); diff --git a/test/std/iterators/iterator.range/begin-end.pass.cpp b/test/std/iterators/iterator.range/begin-end.pass.cpp index 4f7405355..681869191 100644 --- a/test/std/iterators/iterator.range/begin-end.pass.cpp +++ b/test/std/iterators/iterator.range/begin-end.pass.cpp @@ -32,7 +32,7 @@ void test_const_container( const C & c, typename C::value_type val ) { assert (*std::begin(c) == val ); assert ( std::begin(c) != c.end()); assert ( std::end(c) == c.end()); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 assert ( std::cbegin(c) == c.cbegin()); assert ( std::cbegin(c) != c.cend()); assert ( std::cend(c) == c.cend()); @@ -51,7 +51,7 @@ void test_const_container( const std::initializer_list<T> & c, T val ) { assert (*std::begin(c) == val ); assert ( std::begin(c) != c.end()); assert ( std::end(c) == c.end()); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 // initializer_list doesn't have cbegin/cend/rbegin/rend // but std::cbegin(),etc work (b/c they're general fn templates) // assert ( std::cbegin(c) == c.cbegin()); @@ -72,7 +72,7 @@ void test_container( C & c, typename C::value_type val ) { assert (*std::begin(c) == val ); assert ( std::begin(c) != c.end()); assert ( std::end(c) == c.end()); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 assert ( std::cbegin(c) == c.cbegin()); assert ( std::cbegin(c) != c.cend()); assert ( std::cend(c) == c.cend()); @@ -91,7 +91,7 @@ void test_container( std::initializer_list<T> & c, T val ) { assert (*std::begin(c) == val ); assert ( std::begin(c) != c.end()); assert ( std::end(c) == c.end()); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 // initializer_list doesn't have cbegin/cend/rbegin/rend // assert ( std::cbegin(c) == c.cbegin()); // assert ( std::cbegin(c) != c.cend()); @@ -111,7 +111,7 @@ void test_const_array( const T (&array)[Sz] ) { assert (*std::begin(array) == array[0] ); assert ( std::begin(array) != std::end(array)); assert ( std::end(array) == array + Sz); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 assert ( std::cbegin(array) == array ); assert (*std::cbegin(array) == array[0] ); assert ( std::cbegin(array) != std::cend(array)); @@ -137,7 +137,7 @@ int main(){ static constexpr int arrA [] { 1, 2, 3 }; test_const_array ( arrA ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr const int *b = std::cbegin(arrA); constexpr const int *e = std::cend(arrA); static_assert(e - b == 3, ""); diff --git a/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp b/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp index 2f0720639..c4cbc15ba 100644 --- a/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp +++ b/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp @@ -16,6 +16,8 @@ #include <initializer_list> #include <cassert> +#include "test_macros.h" + #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS struct A @@ -32,7 +34,7 @@ struct A } }; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct B { constexpr B(std::initializer_list<int> il) @@ -47,7 +49,7 @@ struct B } }; -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS @@ -56,7 +58,7 @@ int main() #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS A test1 = {3, 2, 1}; #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr B test2 = {3, 2, 1}; -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 } diff --git a/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp b/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp index 7822a6220..e09183434 100644 --- a/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp +++ b/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp @@ -14,6 +14,8 @@ #include <initializer_list> #include <cassert> +#include "test_macros.h" + struct A {}; int main() @@ -22,8 +24,8 @@ int main() std::initializer_list<A> il; assert(il.size() == 0); #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr std::initializer_list<A> il2; static_assert(il2.size() == 0, ""); -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 } diff --git a/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp b/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp index 5fcd28f91..f76aa5f72 100644 --- a/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp +++ b/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp @@ -14,6 +14,8 @@ #include <initializer_list> #include <cassert> +#include "test_macros.h" + #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS struct A @@ -30,7 +32,7 @@ struct A } }; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct B { constexpr B(std::initializer_list<int> il) @@ -45,7 +47,7 @@ struct B } }; -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS int main() @@ -53,7 +55,7 @@ int main() #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS A test1 = {3, 2, 1}; #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr B test2 = {3, 2, 1}; -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 } diff --git a/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp b/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp index 5f57df12f..6f0994a00 100644 --- a/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp +++ b/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp @@ -19,12 +19,13 @@ #include <sstream> #include <cassert> +#include "test_macros.h" #include "count_new.hpp" int main() { typedef std::wbuffer_convert<std::codecvt_utf8<wchar_t> > B; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_convertible<std::streambuf*, B>::value, ""); static_assert( std::is_constructible<B, std::streambuf*>::value, ""); #endif diff --git a/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp b/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp index 9099b5e38..b56b72fb0 100644 --- a/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp +++ b/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp @@ -17,6 +17,8 @@ #include <codecvt> #include <cassert> +#include "test_macros.h" + int main() { { @@ -30,7 +32,7 @@ int main() typedef std::wstring_convert<Codecvt> Myconv; Myconv myconv(new Codecvt); assert(myconv.converted() == 0); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_convertible<Codecvt*, Myconv>::value, ""); static_assert( std::is_constructible<Myconv, Codecvt*>::value, ""); #endif diff --git a/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp b/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp index 5a58b06cc..307311dd9 100644 --- a/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp +++ b/test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp @@ -19,11 +19,13 @@ #include <codecvt> #include <cassert> +#include "test_macros.h" + int main() { typedef std::codecvt_utf8<wchar_t> Codecvt; typedef std::wstring_convert<Codecvt> Myconv; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_convertible<std::string, Myconv>::value, ""); static_assert( std::is_constructible<Myconv, std::string>::value, ""); #endif diff --git a/test/std/numerics/complex.number/cmplx.over/imag.pass.cpp b/test/std/numerics/complex.number/cmplx.over/imag.pass.cpp index 7decea877..b5cffe9c1 100644 --- a/test/std/numerics/complex.number/cmplx.over/imag.pass.cpp +++ b/test/std/numerics/complex.number/cmplx.over/imag.pass.cpp @@ -17,6 +17,7 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" #include "../cases.h" template <class T, int x> @@ -25,7 +26,7 @@ test(typename std::enable_if<std::is_integral<T>::value>::type* = 0) { static_assert((std::is_same<decltype(std::imag(T(x))), double>::value), ""); assert(std::imag(x) == 0); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr T val {x}; static_assert(std::imag(val) == 0, ""); constexpr std::complex<T> t{val, val}; @@ -39,7 +40,7 @@ test(typename std::enable_if<!std::is_integral<T>::value>::type* = 0) { static_assert((std::is_same<decltype(std::imag(T(x))), T>::value), ""); assert(std::imag(x) == 0); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr T val {x}; static_assert(std::imag(val) == 0, ""); constexpr std::complex<T> t{val, val}; diff --git a/test/std/numerics/complex.number/cmplx.over/real.pass.cpp b/test/std/numerics/complex.number/cmplx.over/real.pass.cpp index 491b35890..07ae3ab7a 100644 --- a/test/std/numerics/complex.number/cmplx.over/real.pass.cpp +++ b/test/std/numerics/complex.number/cmplx.over/real.pass.cpp @@ -17,6 +17,7 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" #include "../cases.h" template <class T, int x> @@ -25,7 +26,7 @@ test(typename std::enable_if<std::is_integral<T>::value>::type* = 0) { static_assert((std::is_same<decltype(std::real(T(x))), double>::value), ""); assert(std::real(x) == x); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr T val {x}; static_assert(std::real(val) == val, ""); constexpr std::complex<T> t{val, val}; @@ -39,7 +40,7 @@ test(typename std::enable_if<!std::is_integral<T>::value>::type* = 0) { static_assert((std::is_same<decltype(std::real(T(x))), T>::value), ""); assert(std::real(x) == x); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr T val {x}; static_assert(std::real(val) == val, ""); constexpr std::complex<T> t{val, val}; diff --git a/test/std/numerics/complex.number/complex.members/real_imag.pass.cpp b/test/std/numerics/complex.number/complex.members/real_imag.pass.cpp index 7ead855f5..8d55fcdb4 100644 --- a/test/std/numerics/complex.number/complex.members/real_imag.pass.cpp +++ b/test/std/numerics/complex.number/complex.members/real_imag.pass.cpp @@ -15,11 +15,13 @@ #include <complex> #include <cassert> +#include "test_macros.h" + template <class T> void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr std::complex<T> c1; static_assert(c1.real() == 0, ""); static_assert(c1.imag() == 0, ""); diff --git a/test/std/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp b/test/std/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp index 970f021f8..59243c7c6 100644 --- a/test/std/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp +++ b/test/std/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include <complex> #include <cassert> +#include "test_macros.h" + template <class T> void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex<T> lhs(1.5, 2.5); constexpr std::complex<T> rhs(1.5, -2.5); diff --git a/test/std/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp b/test/std/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp index 3c8b772bc..cd6972b9d 100644 --- a/test/std/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp +++ b/test/std/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp @@ -16,11 +16,13 @@ #include <complex> #include <cassert> +#include "test_macros.h" + template <class T> void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex<T> lhs(1.5, 2.5); constexpr T rhs(-2.5); diff --git a/test/std/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp b/test/std/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp index ee138c1ec..9c8ffe0b0 100644 --- a/test/std/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp +++ b/test/std/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include <complex> #include <cassert> +#include "test_macros.h" + template <class T> void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex<T> lhs(1.5, 2.5); constexpr std::complex<T> rhs(1.5, -2.5); diff --git a/test/std/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp b/test/std/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp index efb1c0e87..deb26e2d9 100644 --- a/test/std/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp +++ b/test/std/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp @@ -16,11 +16,13 @@ #include <complex> #include <cassert> +#include "test_macros.h" + template <class T> void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex<T> lhs(1.5, 2.5); constexpr T rhs(-2.5); diff --git a/test/std/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp b/test/std/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp index 0cd903541..777d7d614 100644 --- a/test/std/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp +++ b/test/std/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include <complex> #include <cassert> +#include "test_macros.h" + template <class T> void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T lhs(-2.5); constexpr std::complex<T> rhs(1.5, 2.5); diff --git a/test/std/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp b/test/std/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp index 7d6003cb8..6bfffb849 100644 --- a/test/std/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp +++ b/test/std/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include <complex> #include <cassert> +#include "test_macros.h" + template <class T> void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T lhs(-2.5); constexpr std::complex<T> rhs(1.5, 2.5); diff --git a/test/std/strings/string.view/string.view.access/data.pass.cpp b/test/std/strings/string.view/string.view.access/data.pass.cpp index 2f5301fa7..7b2350923 100644 --- a/test/std/strings/string.view/string.view.access/data.pass.cpp +++ b/test/std/strings/string.view/string.view.access/data.pass.cpp @@ -39,7 +39,7 @@ int main () { test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char *s = "ABC"; constexpr std::basic_string_view<char> sv( s, 2 ); diff --git a/test/std/strings/string.view/string.view.access/index.pass.cpp b/test/std/strings/string.view/string.view.access/index.pass.cpp index 6bf556d1f..65eb6b4f6 100644 --- a/test/std/strings/string.view/string.view.access/index.pass.cpp +++ b/test/std/strings/string.view/string.view.access/index.pass.cpp @@ -42,7 +42,7 @@ int main () { test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::basic_string_view<char> sv ( "ABC", 2 ); static_assert ( sv.length() == 2, "" ); diff --git a/test/std/strings/string.view/string.view.capacity/capacity.pass.cpp b/test/std/strings/string.view/string.view.capacity/capacity.pass.cpp index 4aef7eebe..d36c27886 100644 --- a/test/std/strings/string.view/string.view.capacity/capacity.pass.cpp +++ b/test/std/strings/string.view/string.view.capacity/capacity.pass.cpp @@ -23,7 +23,7 @@ template<typename SV> void test1 () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr SV sv1; static_assert ( sv1.size() == 0, "" ); diff --git a/test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp b/test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp index d4bf31098..079c89191 100644 --- a/test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp b/test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp index a7c10e6fc..59cd7215b 100644 --- a/test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp b/test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp index 0bbba5b12..a75cb3185 100644 --- a/test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp b/test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp index 580ea4631..85455e18d 100644 --- a/test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp b/test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp index 124c28535..d4dc39e89 100644 --- a/test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp b/test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp index 8d8a922aa..09f5360cd 100644 --- a/test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp b/test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp index 6fdabb1a1..da6e2d90a 100644 --- a/test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp b/test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp index 1fab35509..17c0b6bfd 100644 --- a/test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp b/test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp index 477268696..554663f1b 100644 --- a/test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp b/test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp index 66b6f03db..9ae1927b4 100644 --- a/test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp b/test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp index 20b3defa1..8a9c4dbfe 100644 --- a/test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp b/test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp index 0030366a2..63a3000f9 100644 --- a/test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp +++ b/test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.cons/default.pass.cpp b/test/std/strings/string.view/string.view.cons/default.pass.cpp index 54a0690e4..ca332801e 100644 --- a/test/std/strings/string.view/string.view.cons/default.pass.cpp +++ b/test/std/strings/string.view/string.view.cons/default.pass.cpp @@ -15,9 +15,11 @@ #include <string_view> #include <cassert> +#include "test_macros.h" + template<typename T> void test () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T sv1; static_assert ( sv1.size() == 0, "" ); diff --git a/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp b/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp index 07427b1b0..6c9939340 100644 --- a/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp +++ b/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp @@ -18,6 +18,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template<typename CharT> @@ -55,7 +56,7 @@ int main () { test ( U"" ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::basic_string_view<char, constexpr_char_traits<char>> sv1 ( "ABCDE" ); static_assert ( sv1.size() == 5, ""); diff --git a/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp b/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp index b96bd4c72..da4d264ae 100644 --- a/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp +++ b/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp @@ -34,7 +34,7 @@ int main () { test ( "QBCDE", 5 ); test ( "QBCDE", 2 ); test ( "", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char *s = "QBCDE"; constexpr std::basic_string_view<char> sv1 ( s, 2 ); @@ -46,7 +46,7 @@ int main () { test ( L"QBCDE", 5 ); test ( L"QBCDE", 2 ); test ( L"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const wchar_t *s = L"QBCDE"; constexpr std::basic_string_view<wchar_t> sv1 ( s, 2 ); @@ -59,7 +59,7 @@ int main () { test ( u"QBCDE", 5 ); test ( u"QBCDE", 2 ); test ( u"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char16_t *s = u"QBCDE"; constexpr std::basic_string_view<char16_t> sv1 ( s, 2 ); @@ -71,7 +71,7 @@ int main () { test ( U"QBCDE", 5 ); test ( U"QBCDE", 2 ); test ( U"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char32_t *s = U"QBCDE"; constexpr std::basic_string_view<char32_t> sv1 ( s, 2 ); diff --git a/test/std/strings/string.view/string.view.find/find_char_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_char_size.pass.cpp index 3c56b36a8..67a913308 100644 --- a/test/std/strings/string.view/string.view.find/find_char_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("abcdeabcdeabcdeabcde"), 'c', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp index 8952d4a95..77e1343cb 100644 --- a/test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -68,7 +69,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'q', 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp index 146c5214d..a15ac1ef2 100644 --- a/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp index 125ef1b7c..5587a0334 100644 --- a/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp index b2a117d47..21722ecc7 100644 --- a/test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'e', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp index 46fc859f9..55e71c4f5 100644 --- a/test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp index f98b876dd..fa9917c6e 100644 --- a/test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp index 64da8016b..5a792974f 100644 --- a/test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'i', 19); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp index 3577518c5..81881dead 100644 --- a/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp index e087db507..314f338e7 100644 --- a/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp index 1eb594921..b4e0196a5 100644 --- a/test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'm', 15); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp index fdc5f2b42..d19010e07 100644 --- a/test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp index 4a84caa06..7d2804bf6 100644 --- a/test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp index ff85457b4..9380f6cd8 100644 --- a/test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -155,7 +156,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp index 604fb5fae..da01b75e7 100644 --- a/test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp b/test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp index 338941a9a..387e834f4 100644 --- a/test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -148,7 +149,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp b/test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp index 388d085c1..6fc87b8e9 100644 --- a/test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp @@ -13,6 +13,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -65,7 +66,7 @@ int main() test(S("abcdeabcdeabcdeabcde"), 'b', 16); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp b/test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp index e1288a914..4d7688206 100644 --- a/test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp @@ -13,6 +13,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -155,7 +156,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp b/test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp index f2e90037c..ce16d418e 100644 --- a/test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp @@ -13,6 +13,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -375,7 +376,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp b/test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp index 73ba02d4f..eded51af2 100644 --- a/test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp +++ b/test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -148,7 +149,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.iterators/begin.pass.cpp b/test/std/strings/string.view/string.view.iterators/begin.pass.cpp index ba1099c62..b766c5168 100644 --- a/test/std/strings/string.view/string.view.iterators/begin.pass.cpp +++ b/test/std/strings/string.view/string.view.iterators/begin.pass.cpp @@ -58,7 +58,7 @@ int main() test(u32string_view{U"123"}); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr string_view sv { "123", 3 }; constexpr u16string_view u16sv {u"123", 3 }; diff --git a/test/std/strings/string.view/string.view.iterators/end.pass.cpp b/test/std/strings/string.view/string.view.iterators/end.pass.cpp index 449323e6c..1afe5944b 100644 --- a/test/std/strings/string.view/string.view.iterators/end.pass.cpp +++ b/test/std/strings/string.view/string.view.iterators/end.pass.cpp @@ -66,7 +66,7 @@ int main() test(u32string_view{U"123"}); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr string_view sv { "123", 3 }; constexpr u16string_view u16sv {u"123", 3 }; diff --git a/test/std/strings/string.view/string.view.modifiers/clear.pass.cpp b/test/std/strings/string.view/string.view.modifiers/clear.pass.cpp index 71aa53289..c1137e80a 100644 --- a/test/std/strings/string.view/string.view.modifiers/clear.pass.cpp +++ b/test/std/strings/string.view/string.view.modifiers/clear.pass.cpp @@ -32,7 +32,7 @@ void test ( const CharT *s, size_t len ) { } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n ) { typedef std::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -60,7 +60,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( test_ce (5) == 0, "" ); #endif diff --git a/test/std/strings/string.view/string.view.modifiers/remove_prefix.pass.cpp b/test/std/strings/string.view/string.view.modifiers/remove_prefix.pass.cpp index 91c8f2ff8..f2f6313ae 100644 --- a/test/std/strings/string.view/string.view.modifiers/remove_prefix.pass.cpp +++ b/test/std/strings/string.view/string.view.modifiers/remove_prefix.pass.cpp @@ -39,7 +39,7 @@ void test ( const CharT *s, size_t len ) { } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce ( 5, 0 ) == 5, "" ); static_assert ( test_ce ( 5, 1 ) == 4, "" ); diff --git a/test/std/strings/string.view/string.view.modifiers/remove_suffix.pass.cpp b/test/std/strings/string.view/string.view.modifiers/remove_suffix.pass.cpp index e012aaf12..41f8362d3 100644 --- a/test/std/strings/string.view/string.view.modifiers/remove_suffix.pass.cpp +++ b/test/std/strings/string.view/string.view.modifiers/remove_suffix.pass.cpp @@ -39,7 +39,7 @@ void test ( const CharT *s, size_t len ) { } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce ( 5, 0 ) == 5, "" ); static_assert ( test_ce ( 5, 1 ) == 4, "" ); diff --git a/test/std/strings/string.view/string.view.modifiers/swap.pass.cpp b/test/std/strings/string.view/string.view.modifiers/swap.pass.cpp index d6f5c9529..780fbad5f 100644 --- a/test/std/strings/string.view/string.view.modifiers/swap.pass.cpp +++ b/test/std/strings/string.view/string.view.modifiers/swap.pass.cpp @@ -36,7 +36,7 @@ void test ( const CharT *s, size_t len ) { } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -66,7 +66,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce (2, 3) == 3, "" ); static_assert ( test_ce (5, 3) == 3, "" ); diff --git a/test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp b/test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp index 434cef88c..c11e144a0 100644 --- a/test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp +++ b/test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp @@ -16,7 +16,9 @@ #include <string_view> #include <cassert> -#if _LIBCPP_STD_VER > 11 +#include "test_macros.h" + +#if TEST_STD_VER > 11 // quoted is C++14 only bool is_skipws ( const std::istream *is ) { diff --git a/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp b/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp index 712530775..eb6eb1e97 100644 --- a/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp +++ b/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } @@ -112,7 +113,7 @@ int main() } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp b/test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp index d119eff01..ddff1dd0a 100644 --- a/test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp +++ b/test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp @@ -14,6 +14,7 @@ #include <string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } @@ -106,7 +107,7 @@ int main () { test(U"abcdefghijklmnopqrst", U"abcdefghijklmnopqrst", 0); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1 { "abcde", 5 }; diff --git a/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp b/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp index 490dc16b6..d9471b5e6 100644 --- a/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp +++ b/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::divides<int> F; @@ -23,7 +25,7 @@ int main() static_assert((std::is_same<int, F::second_argument_type>::value), "" ); static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(36, 4) == 9); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::divides<> F2; const F2 f2 = F2(); assert(f2(36, 4) == 9); diff --git a/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp b/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp index 9bda541f8..e8f5f5f9a 100644 --- a/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp +++ b/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::minus<int> F; @@ -23,7 +25,7 @@ int main() static_assert((std::is_same<int, F::second_argument_type>::value), "" ); static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(3, 2) == 1); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::minus<> F2; const F2 f2 = F2(); assert(f2(3,2) == 1); diff --git a/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp b/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp index ca5bba6d5..6f39792e9 100644 --- a/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp +++ b/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::modulus<int> F; @@ -23,7 +25,7 @@ int main() static_assert((std::is_same<int, F::second_argument_type>::value), "" ); static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(36, 8) == 4); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::modulus<> F2; const F2 f2 = F2(); assert(f2(36, 8) == 4); diff --git a/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp b/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp index f132c8d4b..dd41f9325 100644 --- a/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp +++ b/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::multiplies<int> F; @@ -23,7 +25,7 @@ int main() static_assert((std::is_same<int, F::second_argument_type>::value), "" ); static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(3, 2) == 6); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::multiplies<> F2; const F2 f2 = F2(); assert(f2(3,2) == 6); diff --git a/test/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp b/test/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp index 0adac6591..95a688f0c 100644 --- a/test/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp +++ b/test/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::negate<int> F; @@ -22,7 +24,7 @@ int main() static_assert((std::is_same<F::argument_type, int>::value), "" ); static_assert((std::is_same<F::result_type, int>::value), "" ); assert(f(36) == -36); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::negate<> F2; const F2 f2 = F2(); assert(f2(36) == -36); diff --git a/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp b/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp index ce544c78b..ad2b14e12 100644 --- a/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp +++ b/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::plus<int> F; @@ -23,7 +25,7 @@ int main() static_assert((std::is_same<int, F::second_argument_type>::value), "" ); static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(3, 2) == 5); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::plus<> F2; const F2 f2 = F2(); assert(f2(3,2) == 5); diff --git a/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp b/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp index c0135fad1..12d968f42 100644 --- a/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp +++ b/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::bit_and<int> F; @@ -27,7 +29,7 @@ int main() assert(f(0x58D3, 0xEA95) == 0x4891); assert(f(0x58D3, 0) == 0); assert(f(0xFFFF, 0x58D3) == 0x58D3); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::bit_and<> F2; const F2 f2 = F2(); assert(f2(0xEA95, 0xEA95) == 0xEA95); diff --git a/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp b/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp index cb33df3d8..90dd9bc09 100644 --- a/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp +++ b/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::bit_or<int> F; @@ -27,7 +29,7 @@ int main() assert(f(0x58D3, 0xEA95) == 0xFAD7); assert(f(0x58D3, 0) == 0x58D3); assert(f(0xFFFF, 0x58D3) == 0xFFFF); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::bit_or<> F2; const F2 f2 = F2(); assert(f2(0xEA95, 0xEA95) == 0xEA95); diff --git a/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp b/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp index bbf2ce5ba..a5cbd17a0 100644 --- a/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp +++ b/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { { @@ -29,7 +31,7 @@ int main() assert(f(0x58D3, 0) == 0x58D3); assert(f(0xFFFF, 0x58D3) == 0xA72C); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::bit_xor<> F2; const F2 f = F2(); diff --git a/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp b/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp index 72f9dc201..ac94fa536 100644 --- a/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp +++ b/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::logical_and<int> F; @@ -26,7 +28,7 @@ int main() assert(!f(36, 0)); assert(!f(0, 36)); assert(!f(0, 0)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::logical_and<> F2; const F2 f2 = F2(); assert( f2(36, 36)); diff --git a/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp b/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp index 8484625a7..4f783dd0f 100644 --- a/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp +++ b/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::logical_not<int> F; @@ -23,7 +25,7 @@ int main() static_assert((std::is_same<F::result_type, bool>::value), "" ); assert(!f(36)); assert(f(0)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::logical_not<> F2; const F2 f2 = F2(); assert(!f2(36)); diff --git a/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp b/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp index 728050440..3c450a05d 100644 --- a/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp +++ b/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp @@ -15,6 +15,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::logical_or<int> F; @@ -26,7 +28,7 @@ int main() assert(f(36, 0)); assert(f(0, 36)); assert(!f(0, 0)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::logical_or<> F2; const F2 f2 = F2(); assert( f2(36, 36)); diff --git a/test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp b/test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp index b689160ba..ed899e7ca 100644 --- a/test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp +++ b/test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp @@ -22,9 +22,11 @@ #include <utility> +#include "test_macros.h" + int main() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 // Should fail to compile, since float is not an integral type using floatmix = std::integer_sequence<float>; @@ -34,5 +36,5 @@ int main() X -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 } diff --git a/test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp b/test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp index 914802423..3df8dd0ed 100644 --- a/test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp +++ b/test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp @@ -13,6 +13,7 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" #include <MoveOnly.h> int A_constructed = 0; @@ -46,7 +47,7 @@ int main() assert(A_constructed == i+1); } } -#if _LIBCPP_STD_VER >= 14 +#if TEST_STD_VER >= 14 { typedef MoveOnly S; typedef std::aligned_storage<3*sizeof(S), std::alignment_of<S>::value>::type diff --git a/test/std/utilities/meta/meta.help/integral_constant.pass.cpp b/test/std/utilities/meta/meta.help/integral_constant.pass.cpp index 335305a28..51a837e4e 100644 --- a/test/std/utilities/meta/meta.help/integral_constant.pass.cpp +++ b/test/std/utilities/meta/meta.help/integral_constant.pass.cpp @@ -14,6 +14,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + int main() { typedef std::integral_constant<int, 5> _5; @@ -26,7 +28,7 @@ int main() assert(_5() == 5); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( _5{}() == 5, "" ); static_assert ( std::true_type{}(), "" ); #endif diff --git a/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp index 28bbedee1..f7902a2be 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp @@ -13,13 +13,15 @@ #include <type_traits> +#include "test_macros.h" + enum Enum {zero, one_}; template <class T, class U> void test_remove_all_extents() { static_assert((std::is_same<typename std::remove_all_extents<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::remove_all_extents_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp index c688c26b9..aa175d9eb 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp @@ -13,13 +13,15 @@ #include <type_traits> +#include "test_macros.h" + enum Enum {zero, one_}; template <class T, class U> void test_remove_extent() { static_assert((std::is_same<typename std::remove_extent<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::remove_extent_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp index 19b1fb4d0..ef1aa8acb 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T, class U> void test_add_const_imp() { static_assert((std::is_same<typename std::add_const<T>::type, const U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::add_const_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp index 4905e518e..c0c2483e4 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T, class U> void test_add_cv_imp() { static_assert((std::is_same<typename std::add_cv<T>::type, const volatile U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::add_cv_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp index 7a12c44a2..f29fb06cd 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T, class U> void test_add_volatile_imp() { static_assert((std::is_same<typename std::add_volatile<T>::type, volatile U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::add_volatile_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp index cd2faf786..426d22d29 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T, class U> void test_remove_const_imp() { static_assert((std::is_same<typename std::remove_const<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::remove_const_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp index 3f6405c82..a6ce05756 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T, class U> void test_remove_cv_imp() { static_assert((std::is_same<typename std::remove_cv<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::remove_cv_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp index 6258a9039..90b8d4bcb 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T, class U> void test_remove_volatile_imp() { static_assert((std::is_same<typename std::remove_volatile<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::remove_volatile_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp index ae849ca54..43f23f5cc 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp @@ -13,12 +13,14 @@ #include <type_traits> +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_VARIADICS { typedef std::aligned_union<10, char >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<10, char>, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 1, ""); @@ -26,7 +28,7 @@ int main() } { typedef std::aligned_union<10, short >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<10, short>, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 2, ""); @@ -34,7 +36,7 @@ int main() } { typedef std::aligned_union<10, int >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<10, int>, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 4, ""); @@ -42,7 +44,7 @@ int main() } { typedef std::aligned_union<10, double >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<10, double>, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 8, ""); @@ -50,7 +52,7 @@ int main() } { typedef std::aligned_union<10, short, char >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<10, short, char>, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 2, ""); @@ -58,7 +60,7 @@ int main() } { typedef std::aligned_union<10, char, short >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<10, char, short>, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 2, ""); @@ -66,7 +68,7 @@ int main() } { typedef std::aligned_union<2, int, char, short >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<2, int, char, short>, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 4, ""); @@ -74,7 +76,7 @@ int main() } { typedef std::aligned_union<2, char, int, short >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<2, char, int, short >, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 4, ""); @@ -82,7 +84,7 @@ int main() } { typedef std::aligned_union<2, char, short, int >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same<std::aligned_union_t<2, char, short, int >, T1>::value, "" ); #endif static_assert(std::alignment_of<T1>::value == 4, ""); diff --git a/test/std/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp index ac11e3a4c..7de0a0737 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + int main() { static_assert((std::is_same<std::conditional<true, char, int>::type, char>::value), ""); static_assert((std::is_same<std::conditional<false, char, int>::type, int>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::conditional_t<true, char, int>, char>::value), ""); static_assert((std::is_same<std::conditional_t<false, char, int>, int>::value), ""); #endif diff --git a/test/std/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp index bd8ae0e29..bcd839849 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T, class U> void test_decay() { static_assert((std::is_same<typename std::decay<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::decay_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp index eb72b0f39..a9b1e1be1 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + int main() { static_assert((std::is_same<std::enable_if<true>::type, void>::value), ""); static_assert((std::is_same<std::enable_if<true, int>::type, int>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::enable_if_t<true>, void>::value), ""); static_assert((std::is_same<std::enable_if_t<true, int>, int>::value), ""); #endif diff --git a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp index 069202062..06f6e6152 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp @@ -38,7 +38,7 @@ template <class T, class U> void test_make_signed() { static_assert((std::is_same<typename std::make_signed<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::make_signed_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp index 41ffdaa72..3d152f604 100644 --- a/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp +++ b/test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp @@ -38,7 +38,7 @@ template <class T, class U> void test_make_unsigned() { static_assert((std::is_same<typename std::make_unsigned<T>::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<std::make_unsigned_t<T>, U>::value), ""); #endif } diff --git a/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp b/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp index 13cad58c0..5154a1d12 100644 --- a/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp +++ b/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp @@ -13,11 +13,13 @@ #include <type_traits> +#include "test_macros.h" + template <class T> void test_lvalue_ref() { static_assert(!std::is_void<T>::value, ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_null_pointer<T>::value, ""); #endif static_assert(!std::is_integral<T>::value, ""); diff --git a/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp b/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp index b0edea37e..cdaf713ac 100644 --- a/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp +++ b/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp @@ -14,11 +14,13 @@ #define _LIBCPP_HAS_NO_VARIADICS #include <type_traits> +#include "test_macros.h" + template <class T> void test_member_function_pointer_imp() { static_assert(!std::is_void<T>::value, ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_null_pointer<T>::value, ""); #endif static_assert(!std::is_integral<T>::value, ""); diff --git a/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp b/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp index 7d7e82ac5..ae5423ef1 100644 --- a/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp @@ -19,6 +19,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + template <class FromDuration, class ToDuration> void test(const FromDuration& df, const ToDuration& d) @@ -35,7 +37,7 @@ test(const FromDuration& df, const ToDuration& d) } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 template<class FromDuration, long long From, class ToDuration, long long To> void test_constexpr () @@ -65,7 +67,7 @@ int main() std::chrono::duration<double, std::ratio<3600> >(7265./3600)); test(std::chrono::duration<int, std::ratio<2, 3> >(9), std::chrono::duration<int, std::ratio<3, 5> >(10)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::hours, 2> (); test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::minutes,121> (); diff --git a/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp b/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp index a37bb266a..a6f7cc0b8 100644 --- a/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp @@ -22,6 +22,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -55,7 +57,7 @@ int main() assert( (t1 != t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T1 t1(Duration1(3)); constexpr T1 t2(Duration1(3)); diff --git a/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp b/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp index 9d94400ed..d7adf29f2 100644 --- a/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp @@ -30,6 +30,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -71,7 +73,7 @@ int main() assert(!(t1 >= t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T1 t1(Duration1(3)); constexpr T1 t2(Duration1(3)); diff --git a/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp b/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp index 6cd7dcb7d..33e349fe8 100644 --- a/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp @@ -17,6 +17,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -27,7 +29,7 @@ int main() std::chrono::time_point<Clock, Duration1> t1 = t2; assert(t1.time_since_epoch() == Duration1(3000)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration2> t2(Duration2(3)); constexpr std::chrono::time_point<Clock, Duration1> t1 = t2; diff --git a/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp b/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp index 01f0bc169..120fd3fb4 100644 --- a/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp @@ -16,6 +16,7 @@ #include <chrono> #include <cassert> +#include "test_macros.h" #include "../../rep.h" int main() @@ -26,7 +27,7 @@ int main() std::chrono::time_point<Clock, Duration> t; assert(t.time_since_epoch() == Duration::zero()); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration> t; static_assert(t.time_since_epoch() == Duration::zero(), ""); diff --git a/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp b/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp index 9d53d86de..1b96902ab 100644 --- a/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp @@ -16,6 +16,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ int main() std::chrono::time_point<Clock, Duration> t(std::chrono::seconds(3)); assert(t.time_since_epoch() == Duration(3000)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration> t(Duration(3)); static_assert(t.time_since_epoch() == Duration(3), ""); diff --git a/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp b/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp index 7a8fa6dcf..19f5cbcd9 100644 --- a/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp @@ -22,6 +22,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -34,7 +36,7 @@ int main() t2 = Duration2(6) + t1; assert(t2.time_since_epoch() == Duration2(3006)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3)); constexpr std::chrono::time_point<Clock, Duration2> t2 = t1 + Duration2(5); diff --git a/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp b/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp index 342d27b5a..4c681fa32 100644 --- a/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp @@ -18,6 +18,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ int main() std::chrono::time_point<Clock, Duration2> t2 = t1 - Duration2(5); assert(t2.time_since_epoch() == Duration2(2995)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3)); constexpr std::chrono::time_point<Clock, Duration2> t2 = t1 - Duration2(5); diff --git a/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp b/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp index 5267f07e1..fcef3f249 100644 --- a/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp +++ b/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp @@ -18,6 +18,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ int main() std::chrono::time_point<Clock, Duration2> t2(Duration2(5)); assert((t1 - t2) == Duration2(2995)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3)); constexpr std::chrono::time_point<Clock, Duration2> t2(Duration2(5)); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp index 6ab303c73..9adbc5406 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp @@ -20,9 +20,10 @@ #include <cassert> #include <type_traits> +#include "test_macros.h" #include "MoveOnly.h" -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct Empty {}; struct A diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp index 367f19e5d..999a9ff11 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp @@ -19,6 +19,7 @@ #include <string> #include <cassert> +#include "test_macros.h" template <class ...> struct never { @@ -86,7 +87,7 @@ int main() std::tuple<int> t(2); assert(std::get<0>(t) == 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::tuple<int> t(2); static_assert(std::get<0>(t) == 2, ""); @@ -101,7 +102,7 @@ int main() assert(std::get<0>(t) == 2); assert(std::get<1>(t) == nullptr); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::tuple<int, char*> t(2, nullptr); static_assert(std::get<0>(t) == 2, ""); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp index d6d489fd0..de847989a 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp @@ -19,6 +19,8 @@ #include <utility> #include <cassert> +#include "test_macros.h" + int main() { { @@ -29,7 +31,7 @@ int main() assert(std::get<0>(t1) == 2); assert(std::get<1>(t1) == short('a')); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<double, char> P0; typedef std::tuple<int, short> T1; diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp index b7fa2e3a0..aa4702b0b 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp @@ -20,6 +20,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + struct Explicit { int value; explicit Explicit(int x) : value(x) {} @@ -43,7 +45,7 @@ struct D explicit D(int i) : B(i) {} }; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct A { @@ -72,7 +74,7 @@ int main() T1 t1 = t0; assert(std::get<0>(t1) == 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple<double> T0; typedef std::tuple<A> T1; diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp index 783c9d1f0..1137df291 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp @@ -19,6 +19,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + struct Empty {}; int main() @@ -50,7 +52,7 @@ int main() assert(std::get<1>(t) == 'a'); assert(std::get<2>(t) == "some text"); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple<int> T; constexpr T t0(2); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp index 2dbe81513..1099e3579 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp @@ -18,6 +18,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + template <class Tuple> void test0(const Tuple&) @@ -54,7 +56,7 @@ test2a(const Tuple& t) assert(std::get<1>(t) == 'a'); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 template <class Tuple> constexpr int test3(const Tuple&) @@ -79,7 +81,7 @@ int main() double i = 2.5; char c = 'a'; test2a(std::forward_as_tuple(i, c)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( test3 (std::forward_as_tuple(i, c)) == 2, "" ); #endif } diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp index f27e8a09f..2c38bf7d2 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp @@ -20,6 +20,8 @@ #include <functional> #include <cassert> +#include "test_macros.h" + int main() { { @@ -40,7 +42,7 @@ int main() assert(i == 0); assert(j == 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr auto t1 = std::make_tuple(0, 1, 3.14); constexpr int i1 = std::get<1>(t1); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp index 52ecd2494..c4c3c242d 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp @@ -20,6 +20,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + int main() { { @@ -29,7 +31,7 @@ int main() assert(i == 42); assert(s == "C++"); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static constexpr int i = 42; static constexpr double f = 1.1; diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp index 770edcaca..18095f7e3 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp @@ -21,6 +21,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" int main() @@ -48,7 +49,7 @@ int main() assert(std::get<0>(t) == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::tuple<> t = std::tuple_cat(); ((void)t); // Prevent unused warning diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp index 002ad148a..f01491674 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp @@ -21,6 +21,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + struct Empty {}; int main() @@ -36,7 +38,7 @@ int main() assert(std::get<0>(t) == "high"); assert(std::get<1>(t) == 5); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple<double, int> T; constexpr T t(2.718, 5); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp index 86d1191db..fc5341289 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp @@ -71,7 +71,7 @@ int main() assert(std::get<2>(t) == 4); assert(d == 2.5); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // get on an rvalue tuple static_assert ( std::get<0> ( std::make_tuple ( 0.0f, 1, 2.0, 3L )) == 0, "" ); static_assert ( std::get<1> ( std::make_tuple ( 0.0f, 1, 2.0, 3L )) == 1, "" ); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp index 42e4fab88..5beedbe9d 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp @@ -23,6 +23,8 @@ #include <tuple> #include <type_traits> +#include "test_macros.h" + template <class T, std::size_t N, class U> void test() { @@ -30,7 +32,7 @@ void test() static_assert((std::is_same<typename std::tuple_element<N, const T>::type, const U>::value), ""); static_assert((std::is_same<typename std::tuple_element<N, volatile T>::type, volatile U>::value), ""); static_assert((std::is_same<typename std::tuple_element<N, const volatile T>::type, const volatile U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same<typename std::tuple_element_t<N, T>, U>::value), ""); static_assert((std::is_same<typename std::tuple_element_t<N, const T>, const U>::value), ""); static_assert((std::is_same<typename std::tuple_element_t<N, volatile T>, volatile U>::value), ""); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp index e5991df63..3724faa6a 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp @@ -21,6 +21,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + int main() { { @@ -143,7 +145,7 @@ int main() assert(!(t1 == t2)); assert(t1 != t2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple<char, int, double> T1; typedef std::tuple<double, char, int> T2; diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp index 34aafb1e1..6c05a88d1 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp @@ -33,6 +33,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + int main() { { @@ -195,7 +197,7 @@ int main() assert(!(t1 > t2)); assert(!(t1 >= t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple<char, int, double> T1; typedef std::tuple<double, char, int> T2; diff --git a/test/std/utilities/utility/pairs/pairs.spec/comparison.pass.cpp b/test/std/utilities/utility/pairs/pairs.spec/comparison.pass.cpp index 9ba8532ab..0a82c294a 100644 --- a/test/std/utilities/utility/pairs/pairs.spec/comparison.pass.cpp +++ b/test/std/utilities/utility/pairs/pairs.spec/comparison.pass.cpp @@ -21,6 +21,8 @@ #include <utility> #include <cassert> +#include "test_macros.h" + int main() { { @@ -79,7 +81,7 @@ int main() assert( (p1 >= p2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair<int, short> P; constexpr P p1(3, 4); diff --git a/test/support/is_transparent.h b/test/support/is_transparent.h index d76b00536..541689314 100644 --- a/test/support/is_transparent.h +++ b/test/support/is_transparent.h @@ -10,8 +10,10 @@ #ifndef TRANSPARENT_H #define TRANSPARENT_H +#include "test_macros.h" + // testing transparent -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct transparent_less { |