Index: test/std/containers/associative/map/map.access/iterator.pass.cpp =================================================================== --- test/std/containers/associative/map/map.access/iterator.pass.cpp +++ test/std/containers/associative/map/map.access/iterator.pass.cpp @@ -29,6 +29,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -207,7 +208,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::map C; C::iterator ii1{}, ii2{}; Index: test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp +++ test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp @@ -18,6 +18,7 @@ #include #include +#include "test_macros.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" @@ -75,7 +76,7 @@ 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 V; V ar[] = Index: test/std/containers/associative/map/map.ops/count.pass.cpp =================================================================== --- test/std/containers/associative/map/map.ops/count.pass.cpp +++ test/std/containers/associative/map/map.ops/count.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -98,7 +99,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::map> M; Index: test/std/containers/associative/map/map.ops/count1.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/count1.fail.cpp +++ test/std/containers/associative/map/map.ops/count1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().count(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/count2.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/count2.fail.cpp +++ test/std/containers/associative/map/map.ops/count2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().count(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/count3.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/count3.fail.cpp +++ test/std/containers/associative/map/map.ops/count3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().count(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/equal_range.pass.cpp =================================================================== --- test/std/containers/associative/map/map.ops/equal_range.pass.cpp +++ test/std/containers/associative/map/map.ops/equal_range.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -297,7 +298,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::map> M; Index: test/std/containers/associative/map/map.ops/equal_range1.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/equal_range1.fail.cpp +++ test/std/containers/associative/map/map.ops/equal_range1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().equal_range(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/equal_range2.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/equal_range2.fail.cpp +++ test/std/containers/associative/map/map.ops/equal_range2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().equal_range(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/equal_range3.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/equal_range3.fail.cpp +++ test/std/containers/associative/map/map.ops/equal_range3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().equal_range(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/find.pass.cpp =================================================================== --- test/std/containers/associative/map/map.ops/find.pass.cpp +++ test/std/containers/associative/map/map.ops/find.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -165,7 +166,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::map> M; Index: test/std/containers/associative/map/map.ops/find1.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/find1.fail.cpp +++ test/std/containers/associative/map/map.ops/find1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().find(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/find2.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/find2.fail.cpp +++ test/std/containers/associative/map/map.ops/find2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().find(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/find3.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/find3.fail.cpp +++ test/std/containers/associative/map/map.ops/find3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().find(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/map/map.ops/lower_bound.pass.cpp =================================================================== --- test/std/containers/associative/map/map.ops/lower_bound.pass.cpp +++ test/std/containers/associative/map/map.ops/lower_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -229,7 +230,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::map> M; Index: test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp +++ test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp +++ test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp +++ test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/map/map.ops/upper_bound.pass.cpp =================================================================== --- test/std/containers/associative/map/map.ops/upper_bound.pass.cpp +++ test/std/containers/associative/map/map.ops/upper_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -228,7 +229,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::map> M; Index: test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp +++ test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp +++ test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp =================================================================== --- test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp +++ test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/multimap/iterator.pass.cpp =================================================================== --- test/std/containers/associative/multimap/iterator.pass.cpp +++ test/std/containers/associative/multimap/iterator.pass.cpp @@ -29,6 +29,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -211,7 +212,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::multimap C; C::iterator ii1{}, ii2{}; Index: test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -76,7 +77,7 @@ 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 V; V ar[] = Index: test/std/containers/associative/multimap/multimap.ops/count.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/count.pass.cpp +++ test/std/containers/associative/multimap/multimap.ops/count.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -92,7 +93,7 @@ } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::multimap> M; typedef M::size_type R; Index: test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().count(C2Int{5}); } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().count(C2Int{5}); } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().count(C2Int{5}); } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp +++ test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -180,7 +181,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::multimap> M; Index: test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().equal_range(C2Int{5}); } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().equal_range(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().equal_range(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/find.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/find.pass.cpp +++ test/std/containers/associative/multimap/multimap.ops/find.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -144,7 +145,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::multimap> M; Index: test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().find(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().find(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 @@ M().find(C2Int{5}); } } -#endif \ No newline at end of file +#endif Index: test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp +++ test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -152,7 +153,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::multimap> M; Index: test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp +++ test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" #include "is_transparent.h" @@ -152,7 +153,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair V; typedef std::multimap> M; Index: test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp +++ test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp @@ -22,9 +22,10 @@ #include #include +#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 Index: test/std/containers/associative/multiset/count.pass.cpp =================================================================== --- test/std/containers/associative/multiset/count.pass.cpp +++ test/std/containers/associative/multiset/count.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -91,7 +92,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset> M; Index: test/std/containers/associative/multiset/equal_range.pass.cpp =================================================================== --- test/std/containers/associative/multiset/equal_range.pass.cpp +++ test/std/containers/associative/multiset/equal_range.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -180,7 +181,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset> M; Index: test/std/containers/associative/multiset/find.pass.cpp =================================================================== --- test/std/containers/associative/multiset/find.pass.cpp +++ test/std/containers/associative/multiset/find.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -164,7 +165,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset> M; Index: test/std/containers/associative/multiset/iterator.pass.cpp =================================================================== --- test/std/containers/associative/multiset/iterator.pass.cpp +++ test/std/containers/associative/multiset/iterator.pass.cpp @@ -29,6 +29,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -195,7 +196,7 @@ assert(*i == j); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::multiset C; C::iterator ii1{}, ii2{}; Index: test/std/containers/associative/multiset/lower_bound.pass.cpp =================================================================== --- test/std/containers/associative/multiset/lower_bound.pass.cpp +++ test/std/containers/associative/multiset/lower_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -152,7 +153,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset> M; Index: test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -51,7 +52,7 @@ assert(*++i == V(5)); assert(*++i == V(6)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::multiset, min_allocator> C; typedef C::value_type V; Index: test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp @@ -18,6 +18,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -57,7 +58,7 @@ 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[] = Index: test/std/containers/associative/multiset/upper_bound.pass.cpp =================================================================== --- test/std/containers/associative/multiset/upper_bound.pass.cpp +++ test/std/containers/associative/multiset/upper_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -152,7 +153,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::multiset> M; Index: test/std/containers/associative/set/count.pass.cpp =================================================================== --- test/std/containers/associative/set/count.pass.cpp +++ test/std/containers/associative/set/count.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -93,7 +94,7 @@ assert(r == 0); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set> M; Index: test/std/containers/associative/set/equal_range.pass.cpp =================================================================== --- test/std/containers/associative/set/equal_range.pass.cpp +++ test/std/containers/associative/set/equal_range.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -228,7 +229,7 @@ assert(r.second == next(m.begin(), 8)); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set> M; Index: test/std/containers/associative/set/find.pass.cpp =================================================================== --- test/std/containers/associative/set/find.pass.cpp +++ test/std/containers/associative/set/find.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -164,7 +165,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set> M; Index: test/std/containers/associative/set/iterator.pass.cpp =================================================================== --- test/std/containers/associative/set/iterator.pass.cpp +++ test/std/containers/associative/set/iterator.pass.cpp @@ -29,6 +29,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -191,7 +192,7 @@ assert(*i == j); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::set C; C::iterator ii1{}, ii2{}; Index: test/std/containers/associative/set/lower_bound.pass.cpp =================================================================== --- test/std/containers/associative/set/lower_bound.pass.cpp +++ test/std/containers/associative/set/lower_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -228,7 +229,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set> M; Index: test/std/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp +++ test/std/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -40,7 +41,7 @@ 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 > Cmp; typedef test_allocator A; Index: test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp +++ test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp @@ -22,6 +22,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -55,7 +56,7 @@ 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[] = Index: test/std/containers/associative/set/upper_bound.pass.cpp =================================================================== --- test/std/containers/associative/set/upper_bound.pass.cpp +++ test/std/containers/associative/set/upper_bound.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" #include "private_constructor.hpp" @@ -228,7 +229,7 @@ } } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef int V; typedef std::set> M; Index: test/std/containers/sequences/array/iterators.pass.cpp =================================================================== --- test/std/containers/sequences/array/iterators.pass.cpp +++ test/std/containers/sequences/array/iterators.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -36,7 +38,7 @@ assert(i == j); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing { typedef std::array C; Index: test/std/containers/sequences/deque/deque.cons/size.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/size.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "test_allocator.h" #include "DefaultOnly.h" #include "min_allocator.h" @@ -22,7 +23,7 @@ void test2(unsigned n) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::deque C; typedef typename C::const_iterator const_iterator; assert(DefaultOnly::count == 0); @@ -64,7 +65,7 @@ void test3(unsigned n, Allocator const &alloc = Allocator()) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::deque C; typedef typename C::const_iterator const_iterator; { @@ -104,7 +105,7 @@ test >(4095); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 test3> (1023); test3>(1); test3> (3); Index: test/std/containers/sequences/deque/iterators.pass.cpp =================================================================== --- test/std/containers/sequences/deque/iterators.pass.cpp +++ test/std/containers/sequences/deque/iterators.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -44,7 +45,7 @@ assert(i == j); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing std::deque::iterator ii1{}, ii2{}; std::deque::iterator ii4 = ii1; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp @@ -15,13 +15,14 @@ #include #include +#include "test_macros.h" #include "DefaultOnly.h" #include "min_allocator.h" template void check_allocator(unsigned n, Allocator const &alloc = Allocator()) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::forward_list C; C d(n, alloc); assert(d.get_allocator() == alloc); Index: test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -120,7 +121,7 @@ C::const_iterator j; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing std::forward_list::iterator ii1{}, ii2{}; std::forward_list::iterator ii4 = ii1; Index: test/std/containers/sequences/list/iterators.pass.cpp =================================================================== --- test/std/containers/sequences/list/iterators.pass.cpp +++ test/std/containers/sequences/list/iterators.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" struct A @@ -135,7 +136,7 @@ assert(j->first == 3); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { std::list c; std::list::iterator ii1{}, ii2{}; Index: test/std/containers/sequences/list/list.cons/size_type.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/size_type.pass.cpp +++ test/std/containers/sequences/list/list.cons/size_type.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "DefaultOnly.h" #include "test_allocator.h" #include "min_allocator.h" @@ -21,7 +22,7 @@ void test3(unsigned n, Allocator const &alloc = Allocator()) { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 typedef std::list C; typedef typename C::const_iterator const_iterator; { @@ -59,7 +60,7 @@ ++i; assert(*i == 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::list > C; C l(3, min_allocator ()); Index: test/std/containers/sequences/vector.bool/iterators.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/iterators.pass.cpp +++ test/std/containers/sequences/vector.bool/iterators.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -94,7 +95,7 @@ C::const_iterator j; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing std::vector::iterator ii1{}, ii2{}; std::vector::iterator ii4 = ii1; Index: test/std/containers/sequences/vector/iterators.pass.cpp =================================================================== --- test/std/containers/sequences/vector/iterators.pass.cpp +++ test/std/containers/sequences/vector/iterators.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" struct A @@ -135,7 +136,7 @@ assert(j->first == 3); } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::vector C; C::iterator ii1{}, ii2{}; Index: test/std/containers/unord/unord.map/iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/iterators.pass.cpp +++ test/std/containers/unord/unord.map/iterators.pass.cpp @@ -24,6 +24,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -108,7 +109,7 @@ C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_map C; C::iterator ii1{}, ii2{}; Index: test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -91,7 +92,7 @@ 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 P; typedef test_allocator> A; Index: test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp @@ -21,6 +21,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -97,7 +98,7 @@ 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 P; typedef test_allocator> A; Index: test/std/containers/unord/unord.multimap/iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/iterators.pass.cpp +++ test/std/containers/unord/unord.multimap/iterators.pass.cpp @@ -24,6 +24,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -114,7 +115,7 @@ C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_multimap C; C::iterator ii1{}, ii2{}; Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp @@ -84,7 +84,7 @@ 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> A; Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -135,7 +136,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == min_allocator >())); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair P; typedef test_allocator> A; Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp @@ -21,6 +21,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" @@ -141,7 +142,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == min_allocator >())); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair P; typedef test_allocator> A; Index: test/std/containers/unord/unord.multiset/iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/iterators.pass.cpp +++ test/std/containers/unord/unord.multiset/iterators.pass.cpp @@ -23,6 +23,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -107,7 +108,7 @@ C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_multiset C; C::iterator ii1{}, ii2{}; Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp @@ -62,7 +62,7 @@ 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> HF; Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp @@ -19,6 +19,7 @@ #include #include +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -88,7 +89,7 @@ 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> HF; Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -93,7 +94,7 @@ 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> HF; Index: test/std/containers/unord/unord.set/iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/iterators.pass.cpp +++ test/std/containers/unord/unord.set/iterators.pass.cpp @@ -23,6 +23,7 @@ #include #include +#include "test_macros.h" #include "min_allocator.h" int main() @@ -107,7 +108,7 @@ C::const_iterator i; } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { // N3644 testing typedef std::unordered_set C; C::iterator ii1{}, ii2{}; Index: test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp @@ -62,7 +62,7 @@ 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> HF; Index: test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp @@ -19,6 +19,7 @@ #include #include +#include "test_macros.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "test_allocator.h" @@ -88,7 +89,7 @@ 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> HF; Index: test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp @@ -20,6 +20,7 @@ #include #include +#include "test_macros.h" #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" @@ -93,7 +94,7 @@ 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> HF; Index: test/std/experimental/optional/optional.nullops/less_equal.pass.cpp =================================================================== --- test/std/experimental/optional/optional.nullops/less_equal.pass.cpp +++ test/std/experimental/optional/optional.nullops/less_equal.pass.cpp @@ -15,9 +15,11 @@ #include +#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; Index: test/std/experimental/string.view/string.view.access/data.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.access/data.pass.cpp +++ test/std/experimental/string.view/string.view.access/data.pass.cpp @@ -39,7 +39,7 @@ 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 sv( s, 2 ); Index: test/std/experimental/string.view/string.view.access/index.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.access/index.pass.cpp +++ test/std/experimental/string.view/string.view.access/index.pass.cpp @@ -42,7 +42,7 @@ test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::experimental::basic_string_view sv ( "ABC", 2 ); static_assert ( sv.length() == 2, "" ); Index: test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp +++ test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp @@ -23,7 +23,7 @@ template void test1 () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr SV sv1; static_assert ( sv1.size() == 0, "" ); Index: test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp +++ test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.cons/default.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.cons/default.pass.cpp +++ test/std/experimental/string.view/string.view.cons/default.pass.cpp @@ -15,9 +15,11 @@ #include #include +#include "test_macros.h" + template void test () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T sv1; static_assert ( sv1.size() == 0, "" ); Index: test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp +++ test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp @@ -18,6 +18,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -55,7 +56,7 @@ test ( U"" ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::experimental::basic_string_view> sv1 ( "ABCDE" ); static_assert ( sv1.size() == 5, ""); Index: test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp +++ test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp @@ -34,7 +34,7 @@ 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 sv1 ( s, 2 ); @@ -46,7 +46,7 @@ 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 sv1 ( s, 2 ); @@ -59,7 +59,7 @@ 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 sv1 ( s, 2 ); @@ -71,7 +71,7 @@ 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 sv1 ( s, 2 ); Index: test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("abcdeabcdeabcdeabcde"), 'c', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -68,7 +69,7 @@ test(S("laenfsbridchgotmkqpj"), 'q', 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("laenfsbridchgotmkqpj"), 'e', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("laenfsbridchgotmkqpj"), 'i', 19); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("laenfsbridchgotmkqpj"), 'm', 15); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -155,7 +156,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -148,7 +149,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -65,7 +66,7 @@ test(S("abcdeabcdeabcdeabcde"), 'b', 16); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -155,7 +156,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -375,7 +376,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp +++ test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -148,7 +149,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.iterators/begin.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.iterators/begin.pass.cpp +++ test/std/experimental/string.view/string.view.iterators/begin.pass.cpp @@ -58,7 +58,7 @@ 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 }; Index: test/std/experimental/string.view/string.view.iterators/end.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.iterators/end.pass.cpp +++ test/std/experimental/string.view/string.view.iterators/end.pass.cpp @@ -66,7 +66,7 @@ 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 }; Index: test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp +++ test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp @@ -32,7 +32,7 @@ } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n ) { typedef std::experimental::basic_string_view SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -60,7 +60,7 @@ test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( test_ce (5) == 0, "" ); #endif Index: test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp +++ test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp @@ -39,7 +39,7 @@ } } -#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 SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ 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, "" ); Index: test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp +++ test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp @@ -39,7 +39,7 @@ } -#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 SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ 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, "" ); Index: test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp +++ test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp @@ -36,7 +36,7 @@ } -#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 SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -66,7 +66,7 @@ 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, "" ); Index: test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp +++ test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp @@ -16,7 +16,9 @@ #include #include -#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 ) { Index: test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp +++ test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp @@ -14,6 +14,7 @@ #include #include +#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 @@ } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1; Index: test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp +++ test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp @@ -14,6 +14,7 @@ #include #include +#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 @@ test(U"abcdefghijklmnopqrst", U"abcdefghijklmnopqrst", 0); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view> SV; constexpr SV sv1 { "abcde", 5 }; Index: test/std/input.output/file.streams/c.files/cstdio.pass.cpp =================================================================== --- test/std/input.output/file.streams/c.files/cstdio.pass.cpp +++ test/std/input.output/file.streams/c.files/cstdio.pass.cpp @@ -12,6 +12,8 @@ #include #include +#include "test_macros.h" + #ifndef BUFSIZ #error BUFSIZ not defined #endif @@ -140,7 +142,7 @@ #ifndef _LIBCPP_HAS_NO_STDIN static_assert((std::is_same::value), ""); -#if _LIBCPP_STD_VER <= 11 +#if TEST_STD_VER <= 11 static_assert((std::is_same::value), ""); #endif static_assert((std::is_same::value), ""); Index: test/std/iterators/iterator.range/begin-end.pass.cpp =================================================================== --- test/std/iterators/iterator.range/begin-end.pass.cpp +++ test/std/iterators/iterator.range/begin-end.pass.cpp @@ -32,7 +32,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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, ""); Index: test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp =================================================================== --- test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp +++ test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp @@ -16,6 +16,8 @@ #include #include +#include "test_macros.h" + #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS struct A @@ -32,7 +34,7 @@ } }; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct B { constexpr B(std::initializer_list il) @@ -47,7 +49,7 @@ } }; -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS @@ -56,7 +58,7 @@ #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 } Index: test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp =================================================================== --- test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp +++ test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + struct A {}; int main() @@ -22,8 +24,8 @@ std::initializer_list 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 il2; static_assert(il2.size() == 0, ""); -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 } Index: test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp =================================================================== --- test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp +++ test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS struct A @@ -30,7 +32,7 @@ } }; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct B { constexpr B(std::initializer_list il) @@ -45,7 +47,7 @@ } }; -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS int main() @@ -53,7 +55,7 @@ #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 } Index: test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp =================================================================== --- test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp +++ test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp @@ -19,12 +19,13 @@ #include #include +#include "test_macros.h" #include "count_new.hpp" int main() { typedef std::wbuffer_convert > B; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_convertible::value, ""); static_assert( std::is_constructible::value, ""); #endif Index: test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp =================================================================== --- test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp +++ test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp @@ -17,6 +17,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -30,7 +32,7 @@ typedef std::wstring_convert Myconv; Myconv myconv(new Codecvt); assert(myconv.converted() == 0); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_convertible::value, ""); static_assert( std::is_constructible::value, ""); #endif Index: test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp =================================================================== --- test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp +++ test/std/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp @@ -19,11 +19,13 @@ #include #include +#include "test_macros.h" + int main() { typedef std::codecvt_utf8 Codecvt; typedef std::wstring_convert Myconv; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_convertible::value, ""); static_assert( std::is_constructible::value, ""); #endif Index: test/std/numerics/complex.number/cmplx.over/imag.pass.cpp =================================================================== --- test/std/numerics/complex.number/cmplx.over/imag.pass.cpp +++ test/std/numerics/complex.number/cmplx.over/imag.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "../cases.h" template @@ -25,7 +26,7 @@ { static_assert((std::is_same::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{val, val}; @@ -39,7 +40,7 @@ { static_assert((std::is_same::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{val, val}; Index: test/std/numerics/complex.number/cmplx.over/real.pass.cpp =================================================================== --- test/std/numerics/complex.number/cmplx.over/real.pass.cpp +++ test/std/numerics/complex.number/cmplx.over/real.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "../cases.h" template @@ -25,7 +26,7 @@ { static_assert((std::is_same::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{val, val}; @@ -39,7 +40,7 @@ { static_assert((std::is_same::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{val, val}; Index: test/std/numerics/complex.number/complex.members/real_imag.pass.cpp =================================================================== --- test/std/numerics/complex.number/complex.members/real_imag.pass.cpp +++ test/std/numerics/complex.number/complex.members/real_imag.pass.cpp @@ -15,11 +15,13 @@ #include #include +#include "test_macros.h" + template void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr std::complex c1; static_assert(c1.real() == 0, ""); static_assert(c1.imag() == 0, ""); Index: test/std/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp =================================================================== --- test/std/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp +++ test/std/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include #include +#include "test_macros.h" + template void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex lhs(1.5, 2.5); constexpr std::complex rhs(1.5, -2.5); Index: test/std/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp =================================================================== --- test/std/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp +++ test/std/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp @@ -16,11 +16,13 @@ #include #include +#include "test_macros.h" + template void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex lhs(1.5, 2.5); constexpr T rhs(-2.5); Index: test/std/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp =================================================================== --- test/std/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp +++ test/std/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include #include +#include "test_macros.h" + template void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex lhs(1.5, 2.5); constexpr std::complex rhs(1.5, -2.5); Index: test/std/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp =================================================================== --- test/std/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp +++ test/std/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp @@ -16,11 +16,13 @@ #include #include +#include "test_macros.h" + template void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::complex lhs(1.5, 2.5); constexpr T rhs(-2.5); Index: test/std/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp =================================================================== --- test/std/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp +++ test/std/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include #include +#include "test_macros.h" + template void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T lhs(-2.5); constexpr std::complex rhs(1.5, 2.5); Index: test/std/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp =================================================================== --- test/std/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp +++ test/std/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp @@ -16,11 +16,13 @@ #include #include +#include "test_macros.h" + template void test_constexpr() { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T lhs(-2.5); constexpr std::complex rhs(1.5, 2.5); Index: test/std/strings/string.view/string.view.access/data.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.access/data.pass.cpp +++ test/std/strings/string.view/string.view.access/data.pass.cpp @@ -39,7 +39,7 @@ 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 sv( s, 2 ); Index: test/std/strings/string.view/string.view.access/index.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.access/index.pass.cpp +++ test/std/strings/string.view/string.view.access/index.pass.cpp @@ -42,7 +42,7 @@ test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::basic_string_view sv ( "ABC", 2 ); static_assert ( sv.length() == 2, "" ); Index: test/std/strings/string.view/string.view.capacity/capacity.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.capacity/capacity.pass.cpp +++ test/std/strings/string.view/string.view.capacity/capacity.pass.cpp @@ -23,7 +23,7 @@ template void test1 () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr SV sv1; static_assert ( sv1.size() == 0, "" ); Index: test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp +++ test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp +++ test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp +++ test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp +++ test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -49,7 +50,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp +++ test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -48,7 +49,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.cons/default.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.cons/default.pass.cpp +++ test/std/strings/string.view/string.view.cons/default.pass.cpp @@ -15,9 +15,11 @@ #include #include +#include "test_macros.h" + template void test () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T sv1; static_assert ( sv1.size() == 0, "" ); Index: test/std/strings/string.view/string.view.cons/from_literal.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.cons/from_literal.pass.cpp +++ test/std/strings/string.view/string.view.cons/from_literal.pass.cpp @@ -18,6 +18,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -55,7 +56,7 @@ test ( U"" ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::basic_string_view> sv1 ( "ABCDE" ); static_assert ( sv1.size() == 5, ""); Index: test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp +++ test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp @@ -34,7 +34,7 @@ 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 sv1 ( s, 2 ); @@ -46,7 +46,7 @@ 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 sv1 ( s, 2 ); @@ -59,7 +59,7 @@ 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 sv1 ( s, 2 ); @@ -71,7 +71,7 @@ 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 sv1 ( s, 2 ); Index: test/std/strings/string.view/string.view.find/find_char_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_char_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("abcdeabcdeabcdeabcde"), 'c', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -68,7 +69,7 @@ test(S("laenfsbridchgotmkqpj"), 'q', 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("laenfsbridchgotmkqpj"), 'e', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("laenfsbridchgotmkqpj"), 'i', 19); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -66,7 +67,7 @@ test(S("laenfsbridchgotmkqpj"), 'm', 15); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -149,7 +150,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -155,7 +156,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -376,7 +377,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp +++ test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -148,7 +149,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp +++ test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -65,7 +66,7 @@ test(S("abcdeabcdeabcdeabcde"), 'b', 16); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp +++ test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -155,7 +156,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp +++ test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -375,7 +376,7 @@ test3(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp +++ test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include #include +#include "test_macros.h" #include "constexpr_char_traits.hpp" template @@ -148,7 +149,7 @@ test1(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.iterators/begin.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.iterators/begin.pass.cpp +++ test/std/strings/string.view/string.view.iterators/begin.pass.cpp @@ -58,7 +58,7 @@ 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 }; Index: test/std/strings/string.view/string.view.iterators/end.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.iterators/end.pass.cpp +++ test/std/strings/string.view/string.view.iterators/end.pass.cpp @@ -66,7 +66,7 @@ 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 }; Index: test/std/strings/string.view/string.view.modifiers/clear.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.modifiers/clear.pass.cpp +++ test/std/strings/string.view/string.view.modifiers/clear.pass.cpp @@ -32,7 +32,7 @@ } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n ) { typedef std::basic_string_view SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -60,7 +60,7 @@ test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( test_ce (5) == 0, "" ); #endif Index: test/std/strings/string.view/string.view.modifiers/remove_prefix.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.modifiers/remove_prefix.pass.cpp +++ test/std/strings/string.view/string.view.modifiers/remove_prefix.pass.cpp @@ -39,7 +39,7 @@ } } -#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 SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ 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, "" ); Index: test/std/strings/string.view/string.view.modifiers/remove_suffix.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.modifiers/remove_suffix.pass.cpp +++ test/std/strings/string.view/string.view.modifiers/remove_suffix.pass.cpp @@ -39,7 +39,7 @@ } -#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 SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ 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, "" ); Index: test/std/strings/string.view/string.view.modifiers/swap.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.modifiers/swap.pass.cpp +++ test/std/strings/string.view/string.view.modifiers/swap.pass.cpp @@ -36,7 +36,7 @@ } -#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 SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -66,7 +66,7 @@ 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, "" ); Index: test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp +++ test/std/strings/string.view/string.view.nonmem/quoted.pass.cpp @@ -16,7 +16,9 @@ #include #include -#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 ) { Index: test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp +++ test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp @@ -14,6 +14,7 @@ #include #include +#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 @@ } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1; Index: test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp =================================================================== --- test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp +++ test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp @@ -14,6 +14,7 @@ #include #include +#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 @@ test(U"abcdefghijklmnopqrst", U"abcdefghijklmnopqrst", 0); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::basic_string_view> SV; constexpr SV sv1 { "abcde", 5 }; Index: test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp =================================================================== --- test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp +++ test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::divides F; @@ -23,7 +25,7 @@ static_assert((std::is_same::value), "" ); static_assert((std::is_same::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); Index: test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp =================================================================== --- test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp +++ test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::minus F; @@ -23,7 +25,7 @@ static_assert((std::is_same::value), "" ); static_assert((std::is_same::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); Index: test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp =================================================================== --- test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp +++ test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::modulus F; @@ -23,7 +25,7 @@ static_assert((std::is_same::value), "" ); static_assert((std::is_same::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); Index: test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp =================================================================== --- test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp +++ test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::multiplies F; @@ -23,7 +25,7 @@ static_assert((std::is_same::value), "" ); static_assert((std::is_same::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); Index: test/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp =================================================================== --- test/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp +++ test/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::negate F; @@ -22,7 +24,7 @@ static_assert((std::is_same::value), "" ); static_assert((std::is_same::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); Index: test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp =================================================================== --- test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp +++ test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::plus F; @@ -23,7 +25,7 @@ static_assert((std::is_same::value), "" ); static_assert((std::is_same::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); Index: test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp =================================================================== --- test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp +++ test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::bit_and F; @@ -27,7 +29,7 @@ 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); Index: test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp =================================================================== --- test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp +++ test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::bit_or F; @@ -27,7 +29,7 @@ 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); Index: test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp =================================================================== --- test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp +++ test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -29,7 +31,7 @@ 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(); Index: test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp =================================================================== --- test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp +++ test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::logical_and F; @@ -26,7 +28,7 @@ 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)); Index: test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp =================================================================== --- test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp +++ test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::logical_not F; @@ -23,7 +25,7 @@ static_assert((std::is_same::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)); Index: test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp =================================================================== --- test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp +++ test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::logical_or F; @@ -26,7 +28,7 @@ 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)); Index: test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp =================================================================== --- test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp +++ test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp @@ -22,9 +22,11 @@ #include +#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; @@ -34,5 +36,5 @@ X -#endif // _LIBCPP_STD_VER > 11 +#endif // TEST_STD_VER > 11 } Index: test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp =================================================================== --- test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp +++ test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp @@ -13,6 +13,7 @@ #include #include +#include "test_macros.h" #include int A_constructed = 0; @@ -46,7 +47,7 @@ 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::value>::type Index: test/std/utilities/meta/meta.help/integral_constant.pass.cpp =================================================================== --- test/std/utilities/meta/meta.help/integral_constant.pass.cpp +++ test/std/utilities/meta/meta.help/integral_constant.pass.cpp @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::integral_constant _5; @@ -26,7 +28,7 @@ assert(_5() == 5); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( _5{}() == 5, "" ); static_assert ( std::true_type{}(), "" ); #endif Index: test/std/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp @@ -13,13 +13,15 @@ #include +#include "test_macros.h" + enum Enum {zero, one_}; template void test_remove_all_extents() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp @@ -13,13 +13,15 @@ #include +#include "test_macros.h" + enum Enum {zero, one_}; template void test_remove_extent() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_add_const_imp() { static_assert((std::is_same::type, const U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_add_cv_imp() { static_assert((std::is_same::type, const volatile U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_add_volatile_imp() { static_assert((std::is_same::type, volatile U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_remove_const_imp() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_remove_cv_imp() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_remove_volatile_imp() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp @@ -13,12 +13,14 @@ #include +#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, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 1, ""); @@ -26,7 +28,7 @@ } { typedef std::aligned_union<10, short >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 2, ""); @@ -34,7 +36,7 @@ } { typedef std::aligned_union<10, int >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 4, ""); @@ -42,7 +44,7 @@ } { typedef std::aligned_union<10, double >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 8, ""); @@ -50,7 +52,7 @@ } { typedef std::aligned_union<10, short, char >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 2, ""); @@ -58,7 +60,7 @@ } { typedef std::aligned_union<10, char, short >::type T1; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(std::is_same, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 2, ""); @@ -66,7 +68,7 @@ } { 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, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 4, ""); @@ -74,7 +76,7 @@ } { 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, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 4, ""); @@ -82,7 +84,7 @@ } { 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, T1>::value, "" ); #endif static_assert(std::alignment_of::value == 4, ""); Index: test/std/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + int main() { static_assert((std::is_same::type, char>::value), ""); static_assert((std::is_same::type, int>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, char>::value), ""); static_assert((std::is_same, int>::value), ""); #endif Index: test/std/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_decay() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + int main() { static_assert((std::is_same::type, void>::value), ""); static_assert((std::is_same::type, int>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, void>::value), ""); static_assert((std::is_same, int>::value), ""); #endif Index: test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp @@ -38,7 +38,7 @@ void test_make_signed() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp @@ -38,7 +38,7 @@ void test_make_unsigned() { static_assert((std::is_same::type, U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); #endif } Index: test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp +++ test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp @@ -13,11 +13,13 @@ #include +#include "test_macros.h" + template void test_lvalue_ref() { static_assert(!std::is_void::value, ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_null_pointer::value, ""); #endif static_assert(!std::is_integral::value, ""); Index: test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp +++ 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 +#include "test_macros.h" + template void test_member_function_pointer_imp() { static_assert(!std::is_void::value, ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert(!std::is_null_pointer::value, ""); #endif static_assert(!std::is_integral::value, ""); Index: test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp +++ test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp @@ -19,6 +19,8 @@ #include #include +#include "test_macros.h" + template void test(const FromDuration& df, const ToDuration& d) @@ -35,7 +37,7 @@ } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 template void test_constexpr () @@ -65,7 +67,7 @@ std::chrono::duration >(7265./3600)); test(std::chrono::duration >(9), std::chrono::duration >(10)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { test_constexpr (); test_constexpr (); Index: test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp +++ test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp @@ -22,6 +22,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -55,7 +57,7 @@ assert( (t1 != t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T1 t1(Duration1(3)); constexpr T1 t2(Duration1(3)); Index: test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp +++ test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp @@ -30,6 +30,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -71,7 +73,7 @@ assert(!(t1 >= t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T1 t1(Duration1(3)); constexpr T1 t2(Duration1(3)); Index: test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp +++ test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp @@ -17,6 +17,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -27,7 +29,7 @@ std::chrono::time_point t1 = t2; assert(t1.time_since_epoch() == Duration1(3000)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point t2(Duration2(3)); constexpr std::chrono::time_point t1 = t2; Index: test/std/utilities/time/time.point/time.point.cons/default.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.cons/default.pass.cpp +++ test/std/utilities/time/time.point/time.point.cons/default.pass.cpp @@ -16,6 +16,7 @@ #include #include +#include "test_macros.h" #include "../../rep.h" int main() @@ -26,7 +27,7 @@ std::chrono::time_point t; assert(t.time_since_epoch() == Duration::zero()); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point t; static_assert(t.time_since_epoch() == Duration::zero(), ""); Index: test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp +++ test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp @@ -16,6 +16,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ std::chrono::time_point 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 t(Duration(3)); static_assert(t.time_since_epoch() == Duration(3), ""); Index: test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp +++ test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp @@ -22,6 +22,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -34,7 +36,7 @@ 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 t1(Duration1(3)); constexpr std::chrono::time_point t2 = t1 + Duration2(5); Index: test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp +++ test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp @@ -18,6 +18,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ std::chrono::time_point 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 t1(Duration1(3)); constexpr std::chrono::time_point t2 = t1 - Duration2(5); Index: test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp =================================================================== --- test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp +++ test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp @@ -18,6 +18,8 @@ #include #include +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ std::chrono::time_point t2(Duration2(5)); assert((t1 - t2) == Duration2(2995)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point t1(Duration1(3)); constexpr std::chrono::time_point t2(Duration2(5)); Index: test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp @@ -23,6 +23,8 @@ #include #include +#include "test_macros.h" + template void test() { @@ -30,7 +32,7 @@ static_assert((std::is_same::type, const U>::value), ""); static_assert((std::is_same::type, volatile U>::value), ""); static_assert((std::is_same::type, const volatile U>::value), ""); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert((std::is_same, U>::value), ""); static_assert((std::is_same, const U>::value), ""); static_assert((std::is_same, volatile U>::value), ""); Index: test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp @@ -20,9 +20,10 @@ #include #include +#include "test_macros.h" #include "MoveOnly.h" -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct Empty {}; struct A Index: test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp @@ -19,6 +19,7 @@ #include #include +#include "test_macros.h" template struct never { @@ -86,7 +87,7 @@ std::tuple t(2); assert(std::get<0>(t) == 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::tuple t(2); static_assert(std::get<0>(t) == 2, ""); @@ -101,7 +102,7 @@ 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 t(2, nullptr); static_assert(std::get<0>(t) == 2, ""); Index: test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp @@ -19,6 +19,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -29,7 +31,7 @@ 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 P0; typedef std::tuple T1; Index: test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp @@ -20,6 +20,8 @@ #include #include +#include "test_macros.h" + struct Explicit { int value; explicit Explicit(int x) : value(x) {} @@ -43,7 +45,7 @@ explicit D(int i) : B(i) {} }; -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 struct A { @@ -72,7 +74,7 @@ T1 t1 = t0; assert(std::get<0>(t1) == 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple T0; typedef std::tuple T1; Index: test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp @@ -19,6 +19,8 @@ #include #include +#include "test_macros.h" + struct Empty {}; int main() @@ -50,7 +52,7 @@ 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 T; constexpr T t0(2); Index: test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp @@ -18,6 +18,8 @@ #include #include +#include "test_macros.h" + template void test0(const Tuple&) @@ -54,7 +56,7 @@ assert(std::get<1>(t) == 'a'); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 template constexpr int test3(const Tuple&) @@ -79,7 +81,7 @@ 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 } Index: test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp @@ -20,6 +20,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -40,7 +42,7 @@ 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); Index: test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp @@ -20,6 +20,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -29,7 +31,7 @@ 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; Index: test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp @@ -21,6 +21,7 @@ #include #include +#include "test_macros.h" #include "MoveOnly.h" int main() @@ -48,7 +49,7 @@ 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 Index: test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp @@ -21,6 +21,8 @@ #include #include +#include "test_macros.h" + struct Empty {}; int main() @@ -36,7 +38,7 @@ 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 T; constexpr T t(2.718, 5); Index: test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp @@ -71,7 +71,7 @@ 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, "" ); Index: test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp @@ -21,6 +21,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -143,7 +145,7 @@ assert(!(t1 == t2)); assert(t1 != t2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple T1; typedef std::tuple T2; Index: test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp @@ -33,6 +33,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -195,7 +197,7 @@ assert(!(t1 > t2)); assert(!(t1 >= t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::tuple T1; typedef std::tuple T2; Index: test/std/utilities/utility/pairs/pairs.spec/comparison.pass.cpp =================================================================== --- test/std/utilities/utility/pairs/pairs.spec/comparison.pass.cpp +++ test/std/utilities/utility/pairs/pairs.spec/comparison.pass.cpp @@ -21,6 +21,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -79,7 +81,7 @@ assert( (p1 >= p2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::pair P; constexpr P p1(3, 4); Index: test/support/is_transparent.h =================================================================== --- test/support/is_transparent.h +++ 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 {