Index: test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp +++ test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp @@ -57,13 +57,13 @@ test(1000); } -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 }; #endif void constexpr_test() { -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr auto p = std::max_element(il,il+8); static_assert ( *p == 8, "" ); #endif Index: test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp +++ test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp @@ -75,14 +75,14 @@ delete [] a; } -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 }; struct less { constexpr bool operator ()( const int &x, const int &y) const { return x < y; }}; #endif void constexpr_test() { -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr auto p = std::max_element(il, il+8, less()); static_assert ( *p == 8, "" ); #endif Index: test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp +++ test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp @@ -57,13 +57,13 @@ test(1000); } -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 }; #endif void constexpr_test() { -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr auto p = std::min_element(il, il+8); static_assert ( *p == 1, "" ); #endif Index: test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp +++ test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp @@ -75,14 +75,14 @@ delete [] a; } -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 }; struct less { constexpr bool operator ()( const int &x, const int &y) const { return x < y; }}; #endif void constexpr_test() { -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr auto p = std::min_element(il, il+8, less()); static_assert(*p == 1, ""); #endif Index: test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp +++ test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp @@ -74,13 +74,13 @@ } } -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 }; #endif void constexpr_test() { -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr auto p = std::minmax_element(il, il+8); static_assert ( *(p.first) == 1, "" ); static_assert ( *(p.second) == 8, "" ); Index: test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp +++ test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp @@ -79,14 +79,14 @@ } } -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr int il[] = { 2, 4, 6, 8, 7, 5, 3, 1 }; struct less { constexpr bool operator ()( const int &x, const int &y) const { return x < y; }}; #endif void constexpr_test() { -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 constexpr auto p = std::minmax_element(il, il+8, less()); static_assert ( *(p.first) == 1, "" ); static_assert ( *(p.second) == 8, "" ); Index: test/std/containers/associative/map/map.access/at.pass.cpp =================================================================== --- test/std/containers/associative/map/map.access/at.pass.cpp +++ test/std/containers/associative/map/map.access/at.pass.cpp @@ -86,7 +86,7 @@ assert(m.at(8) == 8.5); assert(m.size() == 7); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/map/map.access/empty.pass.cpp =================================================================== --- test/std/containers/associative/map/map.access/empty.pass.cpp +++ test/std/containers/associative/map/map.access/empty.pass.cpp @@ -29,7 +29,7 @@ m.clear(); assert(m.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; M m; 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 @@ -119,7 +119,7 @@ assert(i->second == 1); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/map/map.access/max_size.pass.cpp =================================================================== --- test/std/containers/associative/map/map.access/max_size.pass.cpp +++ test/std/containers/associative/map/map.access/max_size.pass.cpp @@ -25,7 +25,7 @@ M m; assert(m.max_size() != 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; M m; Index: test/std/containers/associative/map/map.access/size.pass.cpp =================================================================== --- test/std/containers/associative/map/map.access/size.pass.cpp +++ test/std/containers/associative/map/map.access/size.pass.cpp @@ -37,7 +37,7 @@ m.erase(m.begin()); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; M m; Index: test/std/containers/associative/map/map.cons/alloc.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/alloc.pass.cpp +++ test/std/containers/associative/map/map.cons/alloc.pass.cpp @@ -29,7 +29,7 @@ assert(m.begin() == m.end()); assert(m.get_allocator() == A(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::less C; typedef min_allocator > A; Index: test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp +++ test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp @@ -45,7 +45,7 @@ assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; std::map, min_allocator> m = Index: test/std/containers/associative/map/map.cons/compare.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/compare.pass.cpp +++ test/std/containers/associative/map/map.cons/compare.pass.cpp @@ -28,7 +28,7 @@ assert(m.begin() == m.end()); assert(m.key_comp() == C(3)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > C; std::map>> m(C(3)); Index: test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp +++ test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp @@ -31,7 +31,7 @@ assert(m.key_comp() == C(4)); assert(m.get_allocator() == A(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > C; typedef min_allocator > A; Index: test/std/containers/associative/map/map.cons/copy.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/copy.pass.cpp +++ test/std/containers/associative/map/map.cons/copy.pass.cpp @@ -92,7 +92,7 @@ assert(*next(mo.begin(), 2) == V(3, 1)); } #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp +++ test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp @@ -56,7 +56,7 @@ assert(*next(mo.begin()) == V(2, 1)); assert(*next(mo.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/map/map.cons/copy_assign.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/copy_assign.pass.cpp +++ test/std/containers/associative/map/map.cons/copy_assign.pass.cpp @@ -107,7 +107,7 @@ assert(*next(mo.begin()) == V(2, 1)); assert(*next(mo.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/map/map.cons/default.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/default.pass.cpp +++ test/std/containers/associative/map/map.cons/default.pass.cpp @@ -25,7 +25,7 @@ assert(m.empty()); assert(m.begin() == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::map, min_allocator>> m; assert(m.empty()); Index: test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp +++ test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::map C; @@ -51,5 +52,4 @@ typedef std::map> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp +++ test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~map() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -27,11 +27,8 @@ bool operator()(const T&, const T&) const noexcept { return false; } }; -#endif - int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::map C; @@ -49,5 +46,4 @@ typedef std::map> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/associative/map/map.cons/initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/initializer_list.pass.cpp +++ test/std/containers/associative/map/map.cons/initializer_list.pass.cpp @@ -41,7 +41,7 @@ assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; std::map, min_allocator> m = Index: test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp +++ test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp @@ -42,7 +42,7 @@ assert(*next(m.begin(), 2) == V(3, 1)); assert(m.key_comp() == C(3)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef test_compare > C; Index: test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp +++ test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp @@ -45,7 +45,7 @@ assert(m.key_comp() == C(3)); assert(m.get_allocator() == A(6)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef test_compare > C; Index: test/std/containers/associative/map/map.cons/iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/iter_iter.pass.cpp +++ test/std/containers/associative/map/map.cons/iter_iter.pass.cpp @@ -42,7 +42,7 @@ assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp +++ test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp @@ -45,7 +45,7 @@ assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = 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 @@ -49,7 +49,7 @@ assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/map/map.cons/move.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/move.pass.cpp +++ test/std/containers/associative/map/map.cons/move.pass.cpp @@ -69,7 +69,7 @@ assert(mo.size() == 0); assert(distance(mo.begin(), mo.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > C; typedef min_allocator A; Index: test/std/containers/associative/map/map.cons/move_alloc.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/move_alloc.pass.cpp +++ test/std/containers/associative/map/map.cons/move_alloc.pass.cpp @@ -189,7 +189,7 @@ } assert(Counter_base::gConstructed == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::pair VC; Index: test/std/containers/associative/map/map.cons/move_assign.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/move_assign.pass.cpp +++ test/std/containers/associative/map/map.cons/move_assign.pass.cpp @@ -144,7 +144,7 @@ assert(m3.key_comp() == C(5)); assert(m1.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::pair VC; Index: test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::map C; @@ -51,5 +52,4 @@ typedef std::map> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp +++ test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -31,7 +33,6 @@ int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::map C; @@ -49,5 +50,4 @@ typedef std::map> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/associative/map/map.modifiers/clear.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/clear.pass.cpp +++ test/std/containers/associative/map/map.modifiers/clear.pass.cpp @@ -39,7 +39,7 @@ m.clear(); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; typedef std::pair P; Index: test/std/containers/associative/map/map.modifiers/emplace.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/emplace.pass.cpp +++ test/std/containers/associative/map/map.modifiers/emplace.pass.cpp @@ -92,7 +92,7 @@ assert(m.begin()->first == 2); assert(m.begin()->second == 3.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; typedef std::pair R; Index: test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp +++ test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp @@ -89,7 +89,7 @@ assert(m.begin()->first == 2); assert(m.begin()->second == 3.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; typedef M::iterator R; Index: test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp +++ test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp @@ -134,7 +134,7 @@ assert(i == m.begin()); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; typedef std::pair P; @@ -242,7 +242,7 @@ assert(i == m.end()); } #endif -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 { // This is LWG #2059 typedef TemplateConstructor T; Index: test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp +++ test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp @@ -86,7 +86,7 @@ assert(i == m.begin()); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; typedef std::pair P; Index: test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp +++ test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp @@ -145,7 +145,7 @@ assert(m.size() == 0); assert(s == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; typedef std::pair P; Index: test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp +++ test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp @@ -43,7 +43,7 @@ assert(*next(m.begin()) == V(2, 1)); assert(*next(m.begin(), 2) == V(3, 1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; std::map, min_allocator> m = Index: test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp +++ test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp @@ -47,7 +47,7 @@ assert(next(m.begin(), 2)->first == 3); assert(next(m.begin(), 2)->second == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> M; typedef std::pair P; 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 @@ -59,7 +59,7 @@ assert(r == 0); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::map, min_allocator> M; 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 @@ -159,7 +159,7 @@ assert(r.second == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::map, min_allocator> M; 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 @@ -93,7 +93,7 @@ assert(r == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::map, min_allocator> M; 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 @@ -125,7 +125,7 @@ assert(r == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::map, min_allocator> M; 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 @@ -124,7 +124,7 @@ assert(r == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::map, min_allocator> M; Index: test/std/containers/associative/map/map.special/member_swap.pass.cpp =================================================================== --- test/std/containers/associative/map/map.special/member_swap.pass.cpp +++ test/std/containers/associative/map/map.special/member_swap.pass.cpp @@ -96,7 +96,7 @@ assert(m2 == m1_save); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator> M; { Index: test/std/containers/associative/map/map.special/non_member_swap.pass.cpp =================================================================== --- test/std/containers/associative/map/map.special/non_member_swap.pass.cpp +++ test/std/containers/associative/map/map.special/non_member_swap.pass.cpp @@ -167,7 +167,7 @@ assert(m2.key_comp() == C(1)); assert(m2.get_allocator() == A(1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator> M; { Index: test/std/containers/associative/map/types.pass.cpp =================================================================== --- test/std/containers/associative/map/types.pass.cpp +++ test/std/containers/associative/map/types.pass.cpp @@ -50,7 +50,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::map, min_allocator>> C; static_assert((std::is_same::value), ""); Index: test/std/containers/associative/multimap/empty.pass.cpp =================================================================== --- test/std/containers/associative/multimap/empty.pass.cpp +++ test/std/containers/associative/multimap/empty.pass.cpp @@ -29,7 +29,7 @@ m.clear(); assert(m.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; M m; 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 @@ -121,7 +121,7 @@ assert(i->second == d); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/multimap/max_size.pass.cpp =================================================================== --- test/std/containers/associative/multimap/max_size.pass.cpp +++ test/std/containers/associative/multimap/max_size.pass.cpp @@ -25,7 +25,7 @@ M m; assert(m.max_size() != 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; M m; Index: test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp @@ -29,7 +29,7 @@ assert(m.begin() == m.end()); assert(m.get_allocator() == A(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::less C; typedef min_allocator > A; Index: test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp @@ -50,7 +50,7 @@ assert(*++i == V(3, 1.5)); assert(*++i == V(3, 2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> C; typedef C::value_type V; Index: test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp @@ -28,7 +28,7 @@ assert(m.begin() == m.end()); assert(m.key_comp() == C(3)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > C; std::multimap>> m(C(3)); Index: test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp @@ -31,7 +31,7 @@ assert(m.key_comp() == C(4)); assert(m.get_allocator() == A(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > C; typedef min_allocator > A; Index: test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp @@ -74,7 +74,7 @@ assert(mo.key_comp() == C(5)); } #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp @@ -47,7 +47,7 @@ assert(mo.get_allocator() == A(7)); assert(mo.key_comp() == C(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp @@ -94,7 +94,7 @@ assert(mo.get_allocator() == A(2)); assert(mo.key_comp() == C(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/multimap/multimap.cons/default.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/default.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/default.pass.cpp @@ -25,7 +25,7 @@ assert(m.empty()); assert(m.begin() == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::multimap, min_allocator>> m; assert(m.empty()); Index: test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::multimap C; @@ -51,5 +52,4 @@ typedef std::multimap> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~multimap() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -27,11 +27,8 @@ bool operator()(const T&, const T&) const { return false; } }; -#endif - int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::multimap C; @@ -49,5 +46,4 @@ typedef std::multimap> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp @@ -49,7 +49,7 @@ assert(*++i == V(3, 1.5)); assert(*++i == V(3, 2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> C; typedef C::value_type V; Index: test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp @@ -53,7 +53,7 @@ assert(*++i == V(3, 2)); assert(m.key_comp() == Cmp(4)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > Cmp; typedef std::multimap>> C; Index: test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp @@ -57,7 +57,7 @@ assert(m.get_allocator() == A(5)); } #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > Cmp; typedef min_allocator > A; 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 @@ -48,7 +48,7 @@ assert(*next(m.begin(), 7) == V(3, 1.5)); assert(*next(m.begin(), 8) == V(3, 2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp @@ -52,7 +52,7 @@ assert(*next(m.begin(), 7) == V(3, 1.5)); assert(*next(m.begin(), 8) == V(3, 2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp @@ -55,7 +55,7 @@ assert(*next(m.begin(), 7) == V(3, 1.5)); assert(*next(m.begin(), 8) == V(3, 2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; V ar[] = Index: test/std/containers/associative/multimap/multimap.cons/move.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/move.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/move.pass.cpp @@ -75,7 +75,7 @@ assert(mo.size() == 0); assert(distance(mo.begin(), mo.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_compare > C; typedef min_allocator A; Index: test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp @@ -189,7 +189,7 @@ } assert(Counter_base::gConstructed == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::pair VC; Index: test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp @@ -144,7 +144,7 @@ assert(m3.key_comp() == C(5)); assert(m1.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair V; typedef std::pair VC; Index: test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::multimap C; @@ -51,5 +52,4 @@ typedef std::multimap> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp +++ test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -31,7 +33,6 @@ int main() { -#if __has_feature(cxx_noexcept) typedef std::pair V; { typedef std::multimap C; @@ -49,5 +50,4 @@ typedef std::multimap> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp @@ -39,7 +39,7 @@ m.clear(); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; typedef std::pair P; Index: test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp @@ -84,7 +84,7 @@ assert(m.begin()->first == 2); assert(m.begin()->second == 3.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; typedef M::iterator R; Index: test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp @@ -89,7 +89,7 @@ assert(m.begin()->first == 2); assert(m.begin()->second == 3.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; typedef M::iterator R; Index: test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp @@ -155,7 +155,7 @@ assert(i == m.begin()); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; typedef std::pair P; @@ -284,7 +284,7 @@ assert(i == m.end()); } #endif -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 { // This is LWG #2059 typedef TemplateConstructor T; Index: test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp @@ -86,7 +86,7 @@ assert(i == m.begin()); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; typedef std::pair P; Index: test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp @@ -84,7 +84,7 @@ assert(m.size() == 0); assert(i == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; typedef std::pair P; Index: test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp @@ -53,7 +53,7 @@ assert(*++i == V(3, 2)); assert(*++i == V(3, 1.5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> C; typedef C::value_type V; Index: test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp +++ test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp @@ -59,7 +59,7 @@ assert(next(m.begin(), 8)->first == 3); assert(next(m.begin(), 8)->second == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; typedef std::pair P; 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 @@ -56,7 +56,7 @@ assert(r == 0); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; { 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 @@ -101,7 +101,7 @@ assert(r.second == m.end()); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; { 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 @@ -83,7 +83,7 @@ assert(r == m.end()); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; { 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 @@ -87,7 +87,7 @@ assert(r == m.end()); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; { 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 @@ -87,7 +87,7 @@ assert(r == m.end()); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; { Index: test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp +++ test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp @@ -96,7 +96,7 @@ assert(m2 == m1_save); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; { Index: test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp =================================================================== --- test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp +++ test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp @@ -167,7 +167,7 @@ assert(m2.key_comp() == C(1)); assert(m2.get_allocator() == A(1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; { Index: test/std/containers/associative/multimap/size.pass.cpp =================================================================== --- test/std/containers/associative/multimap/size.pass.cpp +++ test/std/containers/associative/multimap/size.pass.cpp @@ -37,7 +37,7 @@ m.erase(m.begin()); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> M; M m; Index: test/std/containers/associative/multimap/types.pass.cpp =================================================================== --- test/std/containers/associative/multimap/types.pass.cpp +++ test/std/containers/associative/multimap/types.pass.cpp @@ -50,7 +50,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multimap, min_allocator>> C; static_assert((std::is_same::value), ""); Index: test/std/containers/associative/multiset/clear.pass.cpp =================================================================== --- test/std/containers/associative/multiset/clear.pass.cpp +++ test/std/containers/associative/multiset/clear.pass.cpp @@ -39,7 +39,7 @@ m.clear(); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef int V; 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 @@ -55,7 +55,7 @@ assert(r == 0); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::multiset, min_allocator> M; Index: test/std/containers/associative/multiset/emplace.pass.cpp =================================================================== --- test/std/containers/associative/multiset/emplace.pass.cpp +++ test/std/containers/associative/multiset/emplace.pass.cpp @@ -68,7 +68,7 @@ assert(m.size() == 1); assert(*r == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/multiset/emplace_hint.pass.cpp =================================================================== --- test/std/containers/associative/multiset/emplace_hint.pass.cpp +++ test/std/containers/associative/multiset/emplace_hint.pass.cpp @@ -68,7 +68,7 @@ assert(m.size() == 1); assert(*r == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/multiset/empty.pass.cpp =================================================================== --- test/std/containers/associative/multiset/empty.pass.cpp +++ test/std/containers/associative/multiset/empty.pass.cpp @@ -29,7 +29,7 @@ m.clear(); assert(m.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; M 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 @@ -100,7 +100,7 @@ assert(r.second == next(m.begin(), 9)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::multiset, min_allocator> M; Index: test/std/containers/associative/multiset/erase_iter.pass.cpp =================================================================== --- test/std/containers/associative/multiset/erase_iter.pass.cpp +++ test/std/containers/associative/multiset/erase_iter.pass.cpp @@ -106,7 +106,7 @@ assert(i == m.begin()); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef int V; @@ -186,7 +186,7 @@ assert(i == m.end()); } #endif -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 { // This is LWG #2059 typedef TemplateConstructor T; Index: test/std/containers/associative/multiset/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/multiset/erase_iter_iter.pass.cpp +++ test/std/containers/associative/multiset/erase_iter_iter.pass.cpp @@ -78,7 +78,7 @@ assert(m.size() == 0); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef int V; Index: test/std/containers/associative/multiset/erase_key.pass.cpp =================================================================== --- test/std/containers/associative/multiset/erase_key.pass.cpp +++ test/std/containers/associative/multiset/erase_key.pass.cpp @@ -72,7 +72,7 @@ assert(m.size() == 0); assert(i == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef int V; 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 @@ -92,7 +92,7 @@ assert(r == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::multiset, min_allocator> M; Index: test/std/containers/associative/multiset/insert_cv.pass.cpp =================================================================== --- test/std/containers/associative/multiset/insert_cv.pass.cpp +++ test/std/containers/associative/multiset/insert_cv.pass.cpp @@ -44,7 +44,7 @@ assert(m.size() == 4); assert(*r == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/multiset/insert_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/multiset/insert_initializer_list.pass.cpp +++ test/std/containers/associative/multiset/insert_initializer_list.pass.cpp @@ -39,7 +39,7 @@ assert(*++i == V(10)); } #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> C; typedef C::value_type V; Index: test/std/containers/associative/multiset/insert_iter_cv.pass.cpp =================================================================== --- test/std/containers/associative/multiset/insert_iter_cv.pass.cpp +++ test/std/containers/associative/multiset/insert_iter_cv.pass.cpp @@ -44,7 +44,7 @@ assert(m.size() == 4); assert(*r == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/multiset/insert_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/multiset/insert_iter_iter.pass.cpp +++ test/std/containers/associative/multiset/insert_iter_iter.pass.cpp @@ -51,7 +51,7 @@ assert(*next(m.begin(), 7) == 3); assert(*next(m.begin(), 8) == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef int V; Index: test/std/containers/associative/multiset/insert_iter_rv.pass.cpp =================================================================== --- test/std/containers/associative/multiset/insert_iter_rv.pass.cpp +++ test/std/containers/associative/multiset/insert_iter_rv.pass.cpp @@ -47,7 +47,7 @@ assert(*r == 3); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/multiset/insert_rv.pass.cpp =================================================================== --- test/std/containers/associative/multiset/insert_rv.pass.cpp +++ test/std/containers/associative/multiset/insert_rv.pass.cpp @@ -47,7 +47,7 @@ assert(*r == 3); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; typedef M::iterator R; 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 @@ -113,7 +113,7 @@ for (int k = 0; k < 3; ++k, ++i) assert(*i == j); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; V ar[] = 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 @@ -86,7 +86,7 @@ assert(r == next(m.begin(), 9)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::multiset, min_allocator> M; Index: test/std/containers/associative/multiset/max_size.pass.cpp =================================================================== --- test/std/containers/associative/multiset/max_size.pass.cpp +++ test/std/containers/associative/multiset/max_size.pass.cpp @@ -25,7 +25,7 @@ M m; assert(m.max_size() != 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; M m; Index: test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp @@ -37,7 +37,7 @@ assert(*++i == V(6)); } #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> C; typedef C::value_type V; Index: test/std/containers/associative/multiset/multiset.cons/default.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/default.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/default.pass.cpp @@ -25,7 +25,7 @@ assert(m.empty()); assert(m.begin() == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::multiset, min_allocator> m; assert(m.empty()); Index: test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::multiset C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -50,5 +51,4 @@ typedef std::multiset> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~multiset() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -27,11 +27,8 @@ bool operator()(const T&, const T&) const { return false; } }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::multiset C; static_assert(std::is_nothrow_destructible::value, ""); @@ -48,5 +45,4 @@ typedef std::multiset> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } 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 @@ -36,7 +36,7 @@ assert(*++i == V(6)); } #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS -#if __cplusplus >= 201103L +#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.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp @@ -50,7 +50,7 @@ assert(*next(m.begin(), 7) == 3); assert(*next(m.begin(), 8) == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; V ar[] = Index: test/std/containers/associative/multiset/multiset.cons/move.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/move.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/move.pass.cpp @@ -77,7 +77,7 @@ assert(distance(mo.begin(), mo.end()) == 0); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; V ar[] = Index: test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp @@ -142,7 +142,7 @@ assert(m1.empty()); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef MoveOnly V; typedef test_compare > C; Index: test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::multiset C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -50,5 +51,4 @@ typedef std::multiset> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp +++ test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -31,7 +33,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::multiset C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -48,5 +49,4 @@ typedef std::multiset> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp =================================================================== --- test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp +++ test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp @@ -96,7 +96,7 @@ assert(m2 == m1_save); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::multiset, min_allocator> M; Index: test/std/containers/associative/multiset/size.pass.cpp =================================================================== --- test/std/containers/associative/multiset/size.pass.cpp +++ test/std/containers/associative/multiset/size.pass.cpp @@ -37,7 +37,7 @@ m.erase(m.begin()); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> M; M m; Index: test/std/containers/associative/multiset/types.pass.cpp =================================================================== --- test/std/containers/associative/multiset/types.pass.cpp +++ test/std/containers/associative/multiset/types.pass.cpp @@ -50,7 +50,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::multiset, min_allocator> C; static_assert((std::is_same::value), ""); 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 @@ -86,7 +86,7 @@ assert(r == next(m.begin(), 9)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::multiset, min_allocator> M; Index: test/std/containers/associative/set/clear.pass.cpp =================================================================== --- test/std/containers/associative/set/clear.pass.cpp +++ test/std/containers/associative/set/clear.pass.cpp @@ -39,7 +39,7 @@ m.clear(); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef int V; 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 @@ -56,7 +56,7 @@ r = m.count(4); assert(r == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::set, min_allocator> M; Index: test/std/containers/associative/set/emplace.pass.cpp =================================================================== --- test/std/containers/associative/set/emplace.pass.cpp +++ test/std/containers/associative/set/emplace.pass.cpp @@ -74,7 +74,7 @@ assert(m.size() == 1); assert(*r.first == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef std::pair R; Index: test/std/containers/associative/set/emplace_hint.pass.cpp =================================================================== --- test/std/containers/associative/set/emplace_hint.pass.cpp +++ test/std/containers/associative/set/emplace_hint.pass.cpp @@ -68,7 +68,7 @@ assert(m.size() == 1); assert(*r == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/set/empty.pass.cpp =================================================================== --- test/std/containers/associative/set/empty.pass.cpp +++ test/std/containers/associative/set/empty.pass.cpp @@ -29,7 +29,7 @@ m.clear(); assert(m.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; M 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 @@ -158,7 +158,7 @@ assert(r.second == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::set, min_allocator> M; Index: test/std/containers/associative/set/erase_iter.pass.cpp =================================================================== --- test/std/containers/associative/set/erase_iter.pass.cpp +++ test/std/containers/associative/set/erase_iter.pass.cpp @@ -106,7 +106,7 @@ assert(i == m.begin()); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef int V; @@ -186,7 +186,7 @@ assert(i == m.end()); } #endif -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 { // This is LWG #2059 typedef TemplateConstructor T; Index: test/std/containers/associative/set/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/set/erase_iter_iter.pass.cpp +++ test/std/containers/associative/set/erase_iter_iter.pass.cpp @@ -78,7 +78,7 @@ assert(m.size() == 0); assert(i == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef int V; Index: test/std/containers/associative/set/erase_key.pass.cpp =================================================================== --- test/std/containers/associative/set/erase_key.pass.cpp +++ test/std/containers/associative/set/erase_key.pass.cpp @@ -109,7 +109,7 @@ assert(m.size() == 0); assert(i == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef int V; 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 @@ -92,7 +92,7 @@ assert(r == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::set, min_allocator> M; Index: test/std/containers/associative/set/insert_cv.pass.cpp =================================================================== --- test/std/containers/associative/set/insert_cv.pass.cpp +++ test/std/containers/associative/set/insert_cv.pass.cpp @@ -48,7 +48,7 @@ assert(m.size() == 3); assert(*r.first == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef std::pair R; Index: test/std/containers/associative/set/insert_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/set/insert_initializer_list.pass.cpp +++ test/std/containers/associative/set/insert_initializer_list.pass.cpp @@ -38,7 +38,7 @@ assert(*++i == V(8)); assert(*++i == V(10)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> C; typedef C::value_type V; Index: test/std/containers/associative/set/insert_iter_cv.pass.cpp =================================================================== --- test/std/containers/associative/set/insert_iter_cv.pass.cpp +++ test/std/containers/associative/set/insert_iter_cv.pass.cpp @@ -44,7 +44,7 @@ assert(m.size() == 3); assert(*r == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/set/insert_iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/set/insert_iter_iter.pass.cpp +++ test/std/containers/associative/set/insert_iter_iter.pass.cpp @@ -45,7 +45,7 @@ assert(*next(m.begin()) == 2); assert(*next(m.begin(), 2) == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef int V; Index: test/std/containers/associative/set/insert_iter_rv.pass.cpp =================================================================== --- test/std/containers/associative/set/insert_iter_rv.pass.cpp +++ test/std/containers/associative/set/insert_iter_rv.pass.cpp @@ -46,7 +46,7 @@ assert(m.size() == 3); assert(*r == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef M::iterator R; Index: test/std/containers/associative/set/insert_rv.pass.cpp =================================================================== --- test/std/containers/associative/set/insert_rv.pass.cpp +++ test/std/containers/associative/set/insert_rv.pass.cpp @@ -50,7 +50,7 @@ assert(m.size() == 3); assert(*r.first == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; typedef std::pair R; 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 @@ -111,7 +111,7 @@ for (int j = 1; j <= m.size(); ++j, ++i) assert(*i == j); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; V ar[] = 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 @@ -124,7 +124,7 @@ assert(r == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::set, min_allocator> M; Index: test/std/containers/associative/set/max_size.pass.cpp =================================================================== --- test/std/containers/associative/set/max_size.pass.cpp +++ test/std/containers/associative/set/max_size.pass.cpp @@ -25,7 +25,7 @@ M m; assert(m.max_size() != 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; M m; Index: test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp +++ test/std/containers/associative/set/set.cons/assign_initializer_list.pass.cpp @@ -36,7 +36,7 @@ assert(*++i == V(5)); assert(*++i == V(6)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> C; typedef C::value_type V; Index: test/std/containers/associative/set/set.cons/default.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/default.pass.cpp +++ test/std/containers/associative/set/set.cons/default.pass.cpp @@ -25,7 +25,7 @@ assert(m.empty()); assert(m.begin() == m.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::set, min_allocator> m; assert(m.empty()); Index: test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp +++ test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::set C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -50,5 +51,4 @@ typedef std::set> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp +++ test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~set() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -27,11 +27,8 @@ bool operator()(const T&, const T&) const { return false; } }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::set C; static_assert(std::is_nothrow_destructible::value, ""); @@ -48,5 +45,4 @@ typedef std::set> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/associative/set/set.cons/initializer_list.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/initializer_list.pass.cpp +++ test/std/containers/associative/set/set.cons/initializer_list.pass.cpp @@ -35,7 +35,7 @@ assert(*++i == V(5)); assert(*++i == V(6)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> C; typedef C::value_type V; Index: test/std/containers/associative/set/set.cons/iter_iter.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/iter_iter.pass.cpp +++ test/std/containers/associative/set/set.cons/iter_iter.pass.cpp @@ -44,7 +44,7 @@ assert(*next(m.begin()) == 2); assert(*next(m.begin(), 2) == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; V ar[] = Index: test/std/containers/associative/set/set.cons/move.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/move.pass.cpp +++ test/std/containers/associative/set/set.cons/move.pass.cpp @@ -70,7 +70,7 @@ assert(mo.size() == 0); assert(distance(mo.begin(), mo.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; V ar[] = Index: test/std/containers/associative/set/set.cons/move_assign.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/move_assign.pass.cpp +++ test/std/containers/associative/set/set.cons/move_assign.pass.cpp @@ -141,7 +141,7 @@ assert(m3.key_comp() == C(5)); assert(m1.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef MoveOnly V; typedef test_compare > C; Index: test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -33,7 +35,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::set C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -50,5 +51,4 @@ typedef std::set> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp +++ test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -31,7 +33,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::set C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -48,5 +49,4 @@ typedef std::set> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/associative/set/set.special/member_swap.pass.cpp =================================================================== --- test/std/containers/associative/set/set.special/member_swap.pass.cpp +++ test/std/containers/associative/set/set.special/member_swap.pass.cpp @@ -96,7 +96,7 @@ assert(m2 == m1_save); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::set, min_allocator> M; Index: test/std/containers/associative/set/size.pass.cpp =================================================================== --- test/std/containers/associative/set/size.pass.cpp +++ test/std/containers/associative/set/size.pass.cpp @@ -37,7 +37,7 @@ m.erase(m.begin()); assert(m.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> M; M m; Index: test/std/containers/associative/set/types.pass.cpp =================================================================== --- test/std/containers/associative/set/types.pass.cpp +++ test/std/containers/associative/set/types.pass.cpp @@ -50,7 +50,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::set, min_allocator> C; static_assert((std::is_same::value), ""); 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 @@ -124,7 +124,7 @@ assert(r == next(m.begin(), 8)); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int V; typedef std::set, min_allocator> M; Index: test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp +++ test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -22,10 +24,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::priority_queue C; static_assert(std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp +++ test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp @@ -11,6 +11,8 @@ // ~priority_queue() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include @@ -18,10 +20,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::priority_queue C; static_assert(std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -22,10 +24,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::priority_queue C; static_assert(std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp +++ test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -22,10 +24,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::priority_queue C; static_assert(std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp +++ test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -22,11 +24,9 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::priority_queue C; C c1, c2; static_assert(noexcept(swap(c1, c2)), ""); } -#endif } Index: test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp +++ test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,10 +23,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::queue C; static_assert(std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp +++ test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp @@ -11,6 +11,8 @@ // ~queue() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include @@ -18,10 +20,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::queue C; static_assert(std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,10 +23,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::queue C; static_assert(std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp +++ test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,10 +23,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::queue C; static_assert(std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp +++ test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,11 +23,9 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::queue C; C c1, c2; static_assert(noexcept(swap(c1, c2)), ""); } -#endif } Index: test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp +++ test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,10 +23,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::stack C; static_assert(std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp +++ test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp @@ -11,6 +11,8 @@ // ~stack() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include @@ -18,10 +20,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::stack C; static_assert(std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,10 +23,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::stack C; static_assert(std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp +++ test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,10 +23,8 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::stack C; static_assert(std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp =================================================================== --- test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp +++ test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -21,11 +23,9 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::stack C; C c1, c2; static_assert(noexcept(swap(c1, c2)), ""); } -#endif } Index: test/std/containers/sequences/deque/deque.capacity/access.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.capacity/access.pass.cpp +++ test/std/containers/sequences/deque/deque.capacity/access.pass.cpp @@ -68,7 +68,7 @@ assert(c.front() == 0); assert(c.back() == 9); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::deque> c = make> >(10); for (unsigned i = 0; i < 10; ++i) Index: test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/alloc.pass.cpp @@ -31,7 +31,7 @@ { test(std::allocator()); test(test_allocator(3)); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test(min_allocator()); test(min_allocator{}); #endif Index: test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp @@ -28,7 +28,7 @@ assert(d[2] == 5); assert(d[3] == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::deque> d; d.assign({3, 4, 5, 6}); Index: test/std/containers/sequences/deque/deque.cons/copy.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/copy.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/copy.pass.cpp @@ -45,7 +45,7 @@ assert(v2.get_allocator() == other_allocator(-2)); } #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45}; int* an = ab + sizeof(ab)/sizeof(ab[0]); Index: test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp @@ -40,7 +40,7 @@ test(std::deque >(ab, an, other_allocator(3)), other_allocator(4)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45}; int* an = ab + sizeof(ab)/sizeof(ab[0]); Index: test/std/containers/sequences/deque/deque.cons/default.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/default.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/default.pass.cpp @@ -24,7 +24,7 @@ { std::deque d; assert(d.size() == 0); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 std::deque d1 = {}; assert(d1.size() == 0); #endif @@ -34,7 +34,7 @@ { test >(); test >(); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test >(); test >(); #endif Index: test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -29,7 +31,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::deque C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -46,5 +47,4 @@ typedef std::deque> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~deque() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_alloc { @@ -27,11 +27,8 @@ ~some_alloc() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::deque C; static_assert(std::is_nothrow_destructible::value, ""); @@ -48,5 +45,4 @@ typedef std::deque> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/initializer_list.pass.cpp @@ -27,7 +27,7 @@ assert(d[2] == 5); assert(d[3] == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::deque> d = {3, 4, 5, 6}; assert(d.size() == 4); Index: test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp @@ -29,7 +29,7 @@ assert(d[2] == 5); assert(d[3] == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::deque> d({3, 4, 5, 6}, min_allocator()); assert(d.get_allocator() == min_allocator()); Index: test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp @@ -56,7 +56,7 @@ test(bidirectional_iterator(ab), bidirectional_iterator(an)); test(random_access_iterator(ab), random_access_iterator(an)); test >(ab, an); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test >(ab, an); #endif } Index: test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp @@ -42,7 +42,7 @@ test(forward_iterator(ab), forward_iterator(an), test_allocator(4)); test(bidirectional_iterator(ab), bidirectional_iterator(an), test_allocator(5)); test(random_access_iterator(ab), random_access_iterator(an), test_allocator(6)); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test(input_iterator(ab), input_iterator(an), min_allocator()); test(forward_iterator(ab), forward_iterator(an), min_allocator()); test(bidirectional_iterator(ab), bidirectional_iterator(an), min_allocator()); Index: test/std/containers/sequences/deque/deque.cons/move.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/move.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/move.pass.cpp @@ -51,7 +51,7 @@ assert(c1.size() == 0); assert(c3.get_allocator() == c1.get_allocator()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45}; int* an = ab + sizeof(ab)/sizeof(ab[0]); Index: test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp @@ -66,7 +66,7 @@ assert(c3.get_allocator() == A(3)); assert(c1.size() != 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45}; int* an = ab + sizeof(ab)/sizeof(ab[0]); Index: test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp @@ -69,7 +69,7 @@ assert(c1.size() == 0); assert(c3.get_allocator() == A(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45}; int* an = ab + sizeof(ab)/sizeof(ab[0]); Index: test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp @@ -16,6 +16,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -31,7 +33,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::deque C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -48,5 +49,4 @@ typedef std::deque> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -29,7 +31,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::deque C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -46,5 +47,4 @@ typedef std::deque> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/op_equal.pass.cpp @@ -46,7 +46,7 @@ assert(l2 == l); assert(l2.get_allocator() == other_allocator(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45}; int* an = ab + sizeof(ab)/sizeof(ab[0]); Index: test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp @@ -28,7 +28,7 @@ assert(d[2] == 5); assert(d[3] == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::deque> d; d = {3, 4, 5, 6}; 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 @@ -100,7 +100,7 @@ test1 >(4095); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test >(4095); #endif Index: test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/size_value.pass.cpp @@ -45,7 +45,7 @@ test >(4096, 1165); test >(4097, 157); test >(4095, 90); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test >(4095, 90); #endif } Index: test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp +++ test/std/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp @@ -47,7 +47,7 @@ test(4096, 1165, a); test(4097, 157, a); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { min_allocator a; test(0, 5, a); Index: test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp @@ -74,7 +74,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp @@ -74,7 +74,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp @@ -80,7 +80,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp @@ -86,7 +86,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp @@ -72,7 +72,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp @@ -72,7 +72,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/push_back.pass.cpp @@ -62,7 +62,7 @@ for (int j = 0; j < N; ++j) test >(rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2046, 2047, 2048, 2049, 4094, 4095, 4096}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp @@ -68,7 +68,7 @@ for (int j = 0; j < N; ++j) test >(rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2046, 2047, 2048, 2049, 4094, 4095, 4096}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp @@ -71,7 +71,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp +++ test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp @@ -77,7 +77,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.special/copy.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.special/copy.pass.cpp +++ test/std/containers/sequences/deque/deque.special/copy.pass.cpp @@ -76,7 +76,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp +++ test/std/containers/sequences/deque/deque.special/copy_backward.pass.cpp @@ -75,7 +75,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.special/move.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.special/move.pass.cpp +++ test/std/containers/sequences/deque/deque.special/move.pass.cpp @@ -75,7 +75,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp +++ test/std/containers/sequences/deque/deque.special/move_backward.pass.cpp @@ -75,7 +75,7 @@ for (int j = 0; j < N; ++j) testN >(rng[i], rng[j]); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); Index: test/std/containers/sequences/deque/deque.special/swap.pass.cpp =================================================================== --- test/std/containers/sequences/deque/deque.special/swap.pass.cpp +++ test/std/containers/sequences/deque/deque.special/swap.pass.cpp @@ -85,7 +85,7 @@ assert((c2 == std::deque(a1, a1+sizeof(a1)/sizeof(a1[0])))); assert(c2.get_allocator() == A(1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049}; const int N = sizeof(rng)/sizeof(rng[0]); 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 @@ -33,7 +33,7 @@ j = c.cbegin(); assert(i == j); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::deque> C; C c; Index: test/std/containers/sequences/deque/types.pass.cpp =================================================================== --- test/std/containers/sequences/deque/types.pass.cpp +++ test/std/containers/sequences/deque/types.pass.cpp @@ -80,7 +80,7 @@ static_assert((std::is_same::allocator_type, std::allocator >::value), ""); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::deque> C; static_assert((std::is_same::value), ""); Index: test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp @@ -38,7 +38,7 @@ assert(c.front() == 0); assert(*c.begin() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp @@ -28,7 +28,7 @@ assert(c.get_allocator() == A(12)); assert(c.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef A::value_type T; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp @@ -117,7 +117,7 @@ assert(c1 == c0); assert(c1.get_allocator() == A(10)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp @@ -42,7 +42,7 @@ assert(*i == 10+n); assert(n == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp @@ -159,7 +159,7 @@ assert(c1.get_allocator() == A(10)); assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef MoveOnly T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp @@ -42,7 +42,7 @@ assert(*i == 10+n); assert(n == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp @@ -47,7 +47,7 @@ assert(*i == 10+n); assert(n == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp @@ -41,7 +41,7 @@ assert(*i == 10); assert(n == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp @@ -50,7 +50,7 @@ assert(c.get_allocator() == A(-2)); } #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp @@ -48,7 +48,7 @@ assert(c == c0); assert(c.get_allocator() == A(9)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp @@ -24,7 +24,7 @@ C c; assert(c.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -29,7 +31,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::forward_list C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -46,5 +47,4 @@ typedef std::forward_list> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~forward_list() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_alloc { @@ -27,11 +27,8 @@ ~some_alloc() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::forward_list C; static_assert(std::is_nothrow_destructible::value, ""); @@ -48,5 +45,4 @@ typedef std::forward_list> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp @@ -28,7 +28,7 @@ assert(*i == n); assert(n == 10); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp @@ -31,7 +31,7 @@ assert(n == 10); assert(c.get_allocator() == A(14)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp @@ -52,7 +52,7 @@ assert(c0.empty()); assert(c.get_allocator() == A(10)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef MoveOnly T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp @@ -52,7 +52,7 @@ assert(!c0.empty()); assert(c.get_allocator() == A(9)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef MoveOnly T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp @@ -16,6 +16,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -31,7 +33,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::forward_list C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -48,5 +49,4 @@ typedef std::forward_list> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -29,7 +31,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::forward_list C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -46,5 +47,4 @@ typedef std::forward_list> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp @@ -32,7 +32,7 @@ assert(*i == n); assert(n == std::end(t) - std::begin(t)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp @@ -36,7 +36,7 @@ assert(n == std::end(t) - std::begin(t)); assert(c.get_allocator() == A(13)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef min_allocator A; 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 @@ -45,7 +45,7 @@ #endif assert(n == N); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef DefaultOnly T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp @@ -29,7 +29,7 @@ assert(*i == v); assert(n == N); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp @@ -32,7 +32,7 @@ assert(n == N); assert(c.get_allocator() == A(12)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef A::value_type T; Index: test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp @@ -60,7 +60,7 @@ C::const_iterator i = c.before_begin(); assert(std::distance(i, c.end()) == 11); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; 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 @@ -71,7 +71,7 @@ C::iterator i; C::const_iterator j; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp @@ -38,7 +38,7 @@ c.clear(); assert(distance(c.begin(), c.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef NotConstructible T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp @@ -52,7 +52,7 @@ assert(*next(c.begin(), 3) == Emplaceable(2, 3.5)); assert(distance(c.begin(), c.end()) == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef Emplaceable T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp @@ -32,7 +32,7 @@ assert(*next(c.begin()) == Emplaceable()); assert(distance(c.begin(), c.end()) == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef Emplaceable T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp @@ -84,7 +84,7 @@ assert(i == c.end()); assert(distance(c.begin(), c.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp @@ -55,7 +55,7 @@ assert(i == c.end()); assert(distance(c.begin(), c.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp @@ -50,7 +50,7 @@ assert(*next(c.begin(), 3) == 2); assert(distance(c.begin(), c.end()) == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp @@ -44,7 +44,7 @@ assert(*next(c.begin(), 3) == 1); assert(*next(c.begin(), 4) == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp @@ -48,7 +48,7 @@ assert(*next(c.begin(), 3) == 1); assert(*next(c.begin(), 4) == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp @@ -52,7 +52,7 @@ assert(*next(c.begin(), 3) == 2); assert(distance(c.begin(), c.end()) == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef MoveOnly T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp @@ -43,7 +43,7 @@ assert(*next(c.begin(), 3) == 3); assert(*next(c.begin(), 4) == 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp @@ -46,7 +46,7 @@ assert(distance(c.begin(), c.end()) == 0); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp @@ -30,7 +30,7 @@ assert(*next(c.begin()) == 1); assert(distance(c.begin(), c.end()) == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp @@ -32,7 +32,7 @@ assert(*next(c.begin()) == 1); assert(distance(c.begin(), c.end()) == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef MoveOnly T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp @@ -64,7 +64,7 @@ assert(*next(c.begin(), 4) == 0); assert(*next(c.begin(), 5) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef DefaultOnly T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp @@ -31,7 +31,7 @@ C c3(std::begin(t3), std::end(t3)); assert(c1 == c3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp @@ -32,7 +32,7 @@ C c3(std::begin(t3), std::end(t3)); assert(c1 == c3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp @@ -103,7 +103,7 @@ } assert ( it == c.end ()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp @@ -88,7 +88,7 @@ assert(c1 == c2); assert(cp.count() == std::distance(std::begin(t1), std::end(t1))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef unary_counting_predicate Predicate; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp @@ -35,7 +35,7 @@ { for (int i = 0; i < 10; ++i) test >(i); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 for (int i = 0; i < 10; ++i) test> >(i); #endif Index: test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp @@ -40,7 +40,7 @@ { for (int i = 0; i < 40; ++i) test >(i); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 for (int i = 0; i < 40; ++i) test> >(i); #endif Index: test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp @@ -41,7 +41,7 @@ { for (int i = 0; i < 40; ++i) test >(i); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 for (int i = 0; i < 40; ++i) test> >(i); #endif Index: test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp @@ -55,7 +55,7 @@ } } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { // splicing different containers typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp @@ -121,7 +121,7 @@ } } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { // splicing different containers typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp @@ -67,7 +67,7 @@ c1.unique(); assert(c1 == c2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp @@ -72,7 +72,7 @@ c1.unique(g); assert(c1 == c2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp @@ -176,7 +176,7 @@ assert(distance(c2.begin(), c2.end()) == 0); assert(c2.get_allocator() == A(1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp +++ test/std/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp @@ -177,7 +177,7 @@ assert(distance(c2.begin(), c2.end()) == 0); assert(c2.get_allocator() == A(1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef min_allocator A; Index: test/std/containers/sequences/forwardlist/max_size.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/max_size.pass.cpp +++ test/std/containers/sequences/forwardlist/max_size.pass.cpp @@ -24,7 +24,7 @@ C c; assert(c.max_size() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::forward_list> C; Index: test/std/containers/sequences/forwardlist/types.pass.cpp =================================================================== --- test/std/containers/sequences/forwardlist/types.pass.cpp +++ test/std/containers/sequences/forwardlist/types.pass.cpp @@ -52,7 +52,7 @@ static_assert((std::is_same::difference_type>::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::forward_list> C; static_assert((std::is_same::value), ""); Index: test/std/containers/sequences/list/db_back.pass.cpp =================================================================== --- test/std/containers/sequences/list/db_back.pass.cpp +++ test/std/containers/sequences/list/db_back.pass.cpp @@ -34,7 +34,7 @@ assert(c.back() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; Index: test/std/containers/sequences/list/db_cback.pass.cpp =================================================================== --- test/std/containers/sequences/list/db_cback.pass.cpp +++ test/std/containers/sequences/list/db_cback.pass.cpp @@ -32,7 +32,7 @@ assert(c.back() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; Index: test/std/containers/sequences/list/db_cfront.pass.cpp =================================================================== --- test/std/containers/sequences/list/db_cfront.pass.cpp +++ test/std/containers/sequences/list/db_cfront.pass.cpp @@ -32,7 +32,7 @@ assert(c.front() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; Index: test/std/containers/sequences/list/db_front.pass.cpp =================================================================== --- test/std/containers/sequences/list/db_front.pass.cpp +++ test/std/containers/sequences/list/db_front.pass.cpp @@ -34,7 +34,7 @@ assert(c.front() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; Index: test/std/containers/sequences/list/db_iterators_6.pass.cpp =================================================================== --- test/std/containers/sequences/list/db_iterators_6.pass.cpp +++ test/std/containers/sequences/list/db_iterators_6.pass.cpp @@ -35,7 +35,7 @@ --i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; Index: test/std/containers/sequences/list/db_iterators_7.pass.cpp =================================================================== --- test/std/containers/sequences/list/db_iterators_7.pass.cpp +++ test/std/containers/sequences/list/db_iterators_7.pass.cpp @@ -35,7 +35,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; Index: test/std/containers/sequences/list/db_iterators_8.pass.cpp =================================================================== --- test/std/containers/sequences/list/db_iterators_8.pass.cpp +++ test/std/containers/sequences/list/db_iterators_8.pass.cpp @@ -33,7 +33,7 @@ T j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; 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 @@ -77,7 +77,7 @@ C::iterator i; C::const_iterator j; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::list> C; Index: test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp +++ test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp @@ -47,7 +47,7 @@ assert(std::distance(l.begin(), l.end()) == 20); } #endif // __LIBCPP_MOVE -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l(5, 2); l.resize(2); Index: test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp +++ test/std/containers/sequences/list/list.capacity/resize_size_value.pass.cpp @@ -33,7 +33,7 @@ assert(l.front() == 2); assert(l.back() == 3.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l(5, 2); l.resize(2, 3.5); Index: test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp +++ test/std/containers/sequences/list/list.cons/assign_copy.pass.cpp @@ -32,7 +32,7 @@ assert(l2 == l); assert(l2.get_allocator() == other_allocator(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list > l(3, 2, min_allocator()); std::list > l2(l, min_allocator()); Index: test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp +++ test/std/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp @@ -29,7 +29,7 @@ assert(*i++ == 5); assert(*i++ == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> d; d.assign({3, 4, 5, 6}); Index: test/std/containers/sequences/list/list.cons/assign_move.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/assign_move.pass.cpp +++ test/std/containers/sequences/list/list.cons/assign_move.pass.cpp @@ -62,7 +62,7 @@ assert(l.empty()); assert(l2.get_allocator() == lo.get_allocator()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list > l(min_allocator{}); std::list > lo(min_allocator{}); Index: test/std/containers/sequences/list/list.cons/copy.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/copy.pass.cpp +++ test/std/containers/sequences/list/list.cons/copy.pass.cpp @@ -38,7 +38,7 @@ assert(l2.get_allocator() == other_allocator(-2)); } #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l(3, 2); std::list> l2 = l; Index: test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp +++ test/std/containers/sequences/list/list.cons/copy_alloc.pass.cpp @@ -31,7 +31,7 @@ assert(l2 == l); assert(l2.get_allocator() == other_allocator(3)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list > l(3, 2, min_allocator()); std::list > l2(l, min_allocator()); Index: test/std/containers/sequences/list/list.cons/default.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/default.pass.cpp +++ test/std/containers/sequences/list/list.cons/default.pass.cpp @@ -33,7 +33,7 @@ assert(l.size() == 0); assert(std::distance(l.begin(), l.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l; assert(l.size() == 0); Index: test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp +++ test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -29,7 +31,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::list C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -46,5 +47,4 @@ typedef std::list> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp +++ test/std/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp @@ -33,7 +33,7 @@ assert(l.size() == 0); assert(std::distance(l.begin(), l.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l; assert(l.size() == 0); Index: test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp +++ test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~list() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_alloc { @@ -27,11 +27,8 @@ ~some_alloc() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::list C; static_assert(std::is_nothrow_destructible::value, ""); @@ -48,5 +45,4 @@ typedef std::list> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp +++ test/std/containers/sequences/list/list.cons/initializer_list.pass.cpp @@ -28,7 +28,7 @@ assert(*i++ == 5); assert(*i++ == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> d = {3, 4, 5, 6}; assert(d.size() == 4); Index: test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp +++ test/std/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp @@ -30,7 +30,7 @@ assert(*i++ == 5); assert(*i++ == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> d({3, 4, 5, 6}, min_allocator()); assert(d.get_allocator() == min_allocator()); Index: test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp +++ test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp @@ -51,7 +51,7 @@ for (std::list::const_iterator i = l.begin(), e = l.end(); i != e; ++i, ++j) assert(*i == j); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a[] = {0, 1, 2, 3}; std::list> l(input_iterator(a), Index: test/std/containers/sequences/list/list.cons/move.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/move.pass.cpp +++ test/std/containers/sequences/list/list.cons/move.pass.cpp @@ -46,7 +46,7 @@ assert(l.empty()); assert(l2.get_allocator() == lo.get_allocator()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list > l(min_allocator{}); std::list > lo(min_allocator{}); Index: test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp +++ test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp @@ -59,7 +59,7 @@ assert(!l.empty()); assert(l2.get_allocator() == other_allocator(4)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list > l(min_allocator{}); std::list > lo(min_allocator{}); Index: test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp @@ -16,6 +16,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -31,7 +33,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::list C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -48,5 +49,4 @@ typedef std::list> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp +++ test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -29,7 +31,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::list C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -46,5 +47,4 @@ typedef std::list> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp +++ test/std/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp @@ -28,7 +28,7 @@ assert(*i++ == 5); assert(*i++ == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> d; d = {3, 4, 5, 6}; 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 @@ -80,7 +80,7 @@ assert(std::distance(l.begin(), l.end()) == 3); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l(3); assert(l.size() == 3); Index: test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp +++ test/std/containers/sequences/list/list.cons/size_value_alloc.pass.cpp @@ -52,7 +52,7 @@ ++i; assert(*i == 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l(3, 2); assert(l.size() == 3); Index: test/std/containers/sequences/list/list.modifiers/clear.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/clear.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/clear.pass.cpp @@ -24,7 +24,7 @@ c.clear(); assert(c.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a[] = {1, 2, 3}; std::list> c(a, a+3); Index: test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/emplace.pass.cpp @@ -60,7 +60,7 @@ } #endif #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { std::list> c; Index: test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/emplace_back.pass.cpp @@ -47,7 +47,7 @@ assert(c.back().geti() == 3); assert(c.back().getd() == 4.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> c; c.emplace_back(2, 3.5); Index: test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/emplace_front.pass.cpp @@ -47,7 +47,7 @@ assert(c.back().geti() == 2); assert(c.back().getd() == 3.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> c; c.emplace_front(2, 3.5); Index: test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter.pass.cpp @@ -39,7 +39,7 @@ assert(l1.size() == 0); assert(distance(l1.begin(), l1.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1(a1, a1+3); Index: test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp @@ -31,7 +31,7 @@ l1.erase(i); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1(a1, a1+3); Index: test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp @@ -32,7 +32,7 @@ l1.erase(i); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1(a1, a1+3); Index: test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp @@ -49,7 +49,7 @@ assert(distance(l1.cbegin(), l1.cend()) == 0); assert(i == l1.begin()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l1(a1, a1+3); std::list>::iterator i = l1.erase(l1.cbegin(), l1.cbegin()); Index: test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp @@ -31,7 +31,7 @@ std::list::iterator i = l1.erase(l2.cbegin(), next(l1.cbegin())); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1(a1, a1+3); Index: test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp @@ -31,7 +31,7 @@ std::list::iterator i = l1.erase(l1.cbegin(), next(l2.cbegin())); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1(a1, a1+3); Index: test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp @@ -31,7 +31,7 @@ std::list::iterator i = l1.erase(l2.cbegin(), next(l2.cbegin())); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1(a1, a1+3); Index: test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp @@ -30,7 +30,7 @@ std::list::iterator i = l1.erase(next(l1.cbegin()), l1.cbegin()); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1(a1, a1+3); Index: test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp @@ -40,7 +40,7 @@ assert(*i++ == 1); assert(*i++ == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> d(10, 1); std::list>::iterator i = d.insert(next(d.cbegin(), 2), {3, 4, 5, 6}); Index: test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp @@ -113,7 +113,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::list> l1; Index: test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp @@ -43,7 +43,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { std::list> l1; Index: test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp @@ -73,7 +73,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; int a2[] = {1, 4, 4, 4, 4, 4, 2, 3}; Index: test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp @@ -76,7 +76,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; int a2[] = {1, 4, 2, 3}; Index: test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/pop_back.pass.cpp @@ -36,7 +36,7 @@ assert(false); #endif } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a[] = {1, 2, 3}; std::list> c(a, a+3); Index: test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/pop_front.pass.cpp @@ -28,7 +28,7 @@ c.pop_front(); assert(c.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a[] = {1, 2, 3}; std::list> c(a, a+3); Index: test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/push_back.pass.cpp @@ -25,7 +25,7 @@ int a[] = {0, 1, 2, 3, 4}; assert(c == std::list(a, a+5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> c; for (int i = 0; i < 5; ++i) Index: test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp @@ -30,7 +30,7 @@ assert(l1.front() == MoveOnly(1)); assert(l1.back() == MoveOnly(2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l1; l1.push_back(MoveOnly(1)); Index: test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/push_front.pass.cpp @@ -25,7 +25,7 @@ int a[] = {4, 3, 2, 1, 0}; assert(c == std::list(a, a+5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> c; for (int i = 0; i < 5; ++i) Index: test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp +++ test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp @@ -30,7 +30,7 @@ assert(l1.front() == MoveOnly(2)); assert(l1.back() == MoveOnly(1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l1; l1.push_front(MoveOnly(1)); Index: test/std/containers/sequences/list/list.ops/merge.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/merge.pass.cpp +++ test/std/containers/sequences/list/list.ops/merge.pass.cpp @@ -27,7 +27,7 @@ c1.merge(c2); assert(c1 == std::list(a3, a3+sizeof(a3)/sizeof(a3[0]))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; Index: test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp +++ test/std/containers/sequences/list/list.ops/merge_comp.pass.cpp @@ -28,7 +28,7 @@ c1.merge(c2, std::greater()); assert(c1 == std::list(a3, a3+sizeof(a3)/sizeof(a3[0]))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {10, 9, 7, 3, 1}; int a2[] = {11, 8, 6, 5, 4, 2, 0}; Index: test/std/containers/sequences/list/list.ops/remove.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/remove.pass.cpp +++ test/std/containers/sequences/list/list.ops/remove.pass.cpp @@ -57,7 +57,7 @@ } assert ( it == c.end ()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3, 4}; int a2[] = {1, 2, 4}; Index: test/std/containers/sequences/list/list.ops/remove_if.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/remove_if.pass.cpp +++ test/std/containers/sequences/list/list.ops/remove_if.pass.cpp @@ -50,7 +50,7 @@ assert(c == std::list(a2, a2+2)); assert(cp.count() == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3, 4}; int a2[] = {3, 4}; Index: test/std/containers/sequences/list/list.ops/reverse.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/reverse.pass.cpp +++ test/std/containers/sequences/list/list.ops/reverse.pass.cpp @@ -25,7 +25,7 @@ c1.reverse(); assert(c1 == std::list(a2, a2+sizeof(a2)/sizeof(a2[0]))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}; int a2[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}; Index: test/std/containers/sequences/list/list.ops/sort.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/sort.pass.cpp +++ test/std/containers/sequences/list/list.ops/sort.pass.cpp @@ -25,7 +25,7 @@ c1.sort(); assert(c1 == std::list(a2, a2+sizeof(a2)/sizeof(a2[0]))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {4, 8, 1, 0, 5, 7, 2, 3, 6, 11, 10, 9}; int a2[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}; Index: test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp +++ test/std/containers/sequences/list/list.ops/sort_comp.pass.cpp @@ -26,7 +26,7 @@ c1.sort(std::greater()); assert(c1 == std::list(a2, a2+sizeof(a2)/sizeof(a2[0]))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {4, 8, 1, 0, 5, 7, 2, 3, 6, 11, 10, 9}; int a2[] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}; Index: test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp +++ test/std/containers/sequences/list/list.ops/splice_pos_list.pass.cpp @@ -411,7 +411,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l1; std::list> l2; Index: test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp +++ test/std/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp @@ -188,7 +188,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l1; std::list> l2(a2, a2+1); Index: test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp +++ test/std/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp @@ -128,7 +128,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::list> l1(a1, a1+3); l1.splice(l1.begin(), l1, next(l1.begin()), next(l1.begin())); Index: test/std/containers/sequences/list/list.ops/unique.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/unique.pass.cpp +++ test/std/containers/sequences/list/list.ops/unique.pass.cpp @@ -25,7 +25,7 @@ c.unique(); assert(c == std::list(a2, a2+4)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {2, 1, 1, 4, 4, 4, 4, 3, 3}; int a2[] = {2, 1, 4, 3}; Index: test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp +++ test/std/containers/sequences/list/list.ops/unique_pred.pass.cpp @@ -30,7 +30,7 @@ c.unique(g); assert(c == std::list(a2, a2+4)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {2, 1, 1, 4, 4, 4, 4, 3, 3}; int a2[] = {2, 1, 4, 3}; Index: test/std/containers/sequences/list/list.special/swap.pass.cpp =================================================================== --- test/std/containers/sequences/list/list.special/swap.pass.cpp +++ test/std/containers/sequences/list/list.special/swap.pass.cpp @@ -86,7 +86,7 @@ assert((c2 == std::list(a1, a1+sizeof(a1)/sizeof(a1[0])))); assert(c2.get_allocator() == A(1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; Index: test/std/containers/sequences/list/types.pass.cpp =================================================================== --- test/std/containers/sequences/list/types.pass.cpp +++ test/std/containers/sequences/list/types.pass.cpp @@ -48,7 +48,7 @@ typename std::iterator_traits::difference_type>::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::list> C; static_assert((std::is_same::value), ""); Index: test/std/containers/sequences/vector.bool/assign_copy.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/assign_copy.pass.cpp +++ test/std/containers/sequences/vector.bool/assign_copy.pass.cpp @@ -32,7 +32,7 @@ assert(l2 == l); assert(l2.get_allocator() == other_allocator(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(3, true, min_allocator()); std::vector > l2(l, min_allocator()); Index: test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp +++ test/std/containers/sequences/vector.bool/assign_initializer_list.pass.cpp @@ -28,7 +28,7 @@ assert(d[2] == false); assert(d[3] == true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d; d.assign({true, false, false, true}); Index: test/std/containers/sequences/vector.bool/assign_move.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/assign_move.pass.cpp +++ test/std/containers/sequences/vector.bool/assign_move.pass.cpp @@ -61,7 +61,7 @@ assert(l.empty()); assert(l2.get_allocator() == lo.get_allocator()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(min_allocator{}); std::vector > lo(min_allocator{}); Index: test/std/containers/sequences/vector.bool/capacity.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/capacity.pass.cpp +++ test/std/containers/sequences/vector.bool/capacity.pass.cpp @@ -29,7 +29,7 @@ v.push_back(0); assert(v.capacity() >= 101); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v; assert(v.capacity() == 0); Index: test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp +++ test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -28,7 +30,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -45,5 +46,4 @@ typedef std::vector> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp +++ test/std/containers/sequences/vector.bool/dtor_noexcept.pass.cpp @@ -11,13 +11,13 @@ // ~vector() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_alloc { @@ -26,11 +26,8 @@ ~some_alloc() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_destructible::value, ""); @@ -47,5 +44,4 @@ typedef std::vector> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/sequences/vector.bool/erase_iter.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/erase_iter.pass.cpp +++ test/std/containers/sequences/vector.bool/erase_iter.pass.cpp @@ -40,7 +40,7 @@ assert(l1.size() == 0); assert(distance(l1.begin(), l1.end()) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> l1(a1, a1+3); std::vector>::const_iterator i = l1.begin(); Index: test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp +++ test/std/containers/sequences/vector.bool/erase_iter_iter.pass.cpp @@ -50,7 +50,7 @@ assert(distance(l1.cbegin(), l1.cend()) == 0); assert(i == l1.begin()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> l1(a1, a1+3); std::vector>::iterator i = l1.erase(l1.cbegin(), l1.cbegin()); Index: test/std/containers/sequences/vector.bool/initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/initializer_list.pass.cpp +++ test/std/containers/sequences/vector.bool/initializer_list.pass.cpp @@ -27,7 +27,7 @@ assert(d[2] == false); assert(d[3] == true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d = {true, false, false, true}; assert(d.size() == 4); Index: test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp +++ test/std/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp @@ -29,7 +29,7 @@ assert(d[2] == false); assert(d[3] == true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d({true, false, false, true}, min_allocator()); assert(d.get_allocator() == min_allocator()); Index: test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp +++ test/std/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp @@ -39,7 +39,7 @@ assert(d[12] == true); assert(d[13] == true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d(10, true); std::vector>::iterator i = d.insert(d.cbegin() + 2, {false, true, true, false}); Index: test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp +++ test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp @@ -89,7 +89,7 @@ for (; j < v.size(); ++j) assert(v[j] == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); bool a[] = {1, 0, 0, 1, 1}; Index: test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp +++ test/std/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp @@ -63,7 +63,7 @@ for (++j; j < v.size(); ++j) assert(v[j] == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); std::vector>::iterator i = v.insert(v.cbegin() + 10, 5, 1); Index: test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp +++ test/std/containers/sequences/vector.bool/insert_iter_value.pass.cpp @@ -60,7 +60,7 @@ for (++j; j < v.size(); ++j) assert(v[j] == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); std::vector>::iterator i = v.insert(v.cbegin() + 10, 1); 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 @@ -58,7 +58,7 @@ C::iterator i; C::const_iterator j; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef bool T; typedef std::vector> C; Index: test/std/containers/sequences/vector.bool/move.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/move.pass.cpp +++ test/std/containers/sequences/vector.bool/move.pass.cpp @@ -45,7 +45,7 @@ assert(l.empty()); assert(l2.get_allocator() == lo.get_allocator()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(min_allocator{}); std::vector > lo(min_allocator{}); Index: test/std/containers/sequences/vector.bool/move_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/move_alloc.pass.cpp +++ test/std/containers/sequences/vector.bool/move_alloc.pass.cpp @@ -58,7 +58,7 @@ assert(!l.empty()); assert(l2.get_allocator() == other_allocator(4)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(min_allocator{}); std::vector > lo(min_allocator{}); Index: test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp +++ test/std/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp @@ -16,6 +16,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -56,7 +58,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -87,6 +88,4 @@ static_assert(!std::is_nothrow_move_assignable::value, ""); } #endif - -#endif } Index: test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp +++ test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -28,7 +30,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -50,5 +51,4 @@ static_assert(!std::is_nothrow_move_constructible::value, ""); #endif } -#endif } Index: test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp +++ test/std/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp @@ -28,7 +28,7 @@ assert(d[2] == false); assert(d[3] == true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d; d = {true, false, false, true}; Index: test/std/containers/sequences/vector.bool/push_back.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/push_back.pass.cpp +++ test/std/containers/sequences/vector.bool/push_back.pass.cpp @@ -31,7 +31,7 @@ assert(c[j] == a[j]); } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { bool a[] = {0, 1, 1, 0, 1, 0, 0}; const unsigned N = sizeof(a)/sizeof(a[0]); Index: test/std/containers/sequences/vector.bool/reference.swap.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/reference.swap.pass.cpp +++ test/std/containers/sequences/vector.bool/reference.swap.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + int main() { @@ -25,7 +27,7 @@ std::vector::reference r1 = v[0]; std::vector::reference r2 = v[3]; -#if __has_feature(cxx_noexcept) +#if TEST_STD_VER >= 11 static_assert((noexcept(v.swap(r1,r2))), ""); #endif @@ -34,4 +36,4 @@ v.swap(r1, r2); assert( r1); assert(!r2); -} \ No newline at end of file +} Index: test/std/containers/sequences/vector.bool/reserve.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/reserve.pass.cpp +++ test/std/containers/sequences/vector.bool/reserve.pass.cpp @@ -34,7 +34,7 @@ assert(v.size() == 100); assert(v.capacity() >= 150); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v; v.reserve(10); Index: test/std/containers/sequences/vector.bool/resize_size.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/resize_size.pass.cpp +++ test/std/containers/sequences/vector.bool/resize_size.pass.cpp @@ -32,7 +32,7 @@ assert(v.size() == 300); assert(v.capacity() >= 400); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); v.resize(50); Index: test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp +++ test/std/containers/sequences/vector.bool/resize_size_value.pass.cpp @@ -33,7 +33,7 @@ for (unsigned i = 50; i < 200; ++i) assert(v[i] == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); v.resize(50, 1); Index: test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp +++ test/std/containers/sequences/vector.bool/shrink_to_fit.pass.cpp @@ -26,7 +26,7 @@ assert(v.capacity() >= 101); assert(v.size() >= 101); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); v.push_back(1); Index: test/std/containers/sequences/vector.bool/swap.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/swap.pass.cpp +++ test/std/containers/sequences/vector.bool/swap.pass.cpp @@ -62,7 +62,7 @@ assert(v[0] == false); assert(v[1] == true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v1(100); std::vector> v2(200); Index: test/std/containers/sequences/vector.bool/types.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/types.pass.cpp +++ test/std/containers/sequences/vector.bool/types.pass.cpp @@ -74,7 +74,7 @@ test >(); static_assert((std::is_same::allocator_type, std::allocator >::value), ""); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test >(); #endif } Index: test/std/containers/sequences/vector.bool/vector_bool.pass.cpp =================================================================== --- test/std/containers/sequences/vector.bool/vector_bool.pass.cpp +++ test/std/containers/sequences/vector.bool/vector_bool.pass.cpp @@ -37,7 +37,7 @@ H h; assert(h(vb) != 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::vector> T; typedef std::hash H; Index: test/std/containers/sequences/vector/contiguous.pass.cpp =================================================================== --- test/std/containers/sequences/vector/contiguous.pass.cpp +++ test/std/containers/sequences/vector/contiguous.pass.cpp @@ -40,7 +40,7 @@ test_contiguous(C(A(3))); test_contiguous(C(7, 9.0, A(5))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef double T; typedef min_allocator A; 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 @@ -77,7 +77,7 @@ C::iterator i; C::const_iterator j; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::vector> C; Index: test/std/containers/sequences/vector/types.pass.cpp =================================================================== --- test/std/containers/sequences/vector/types.pass.cpp +++ test/std/containers/sequences/vector/types.pass.cpp @@ -86,7 +86,7 @@ test >(); static_assert((std::is_same::allocator_type, std::allocator >::value), ""); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::vector > C; Index: test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp +++ test/std/containers/sequences/vector/vector.capacity/capacity.pass.cpp @@ -31,7 +31,7 @@ assert(v.capacity() > 101); assert(is_contiguous_container_asan_correct(v)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v; assert(v.capacity() == 0); Index: test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp +++ test/std/containers/sequences/vector/vector.capacity/reserve.pass.cpp @@ -47,7 +47,7 @@ assert(v.capacity() == 150); assert(is_contiguous_container_asan_correct(v)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v; v.reserve(10); Index: test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp +++ test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp @@ -67,7 +67,7 @@ assert(is_contiguous_container_asan_correct(v)); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); v.resize(50); Index: test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp +++ test/std/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp @@ -44,7 +44,7 @@ assert(v.capacity() >= 200); assert(is_contiguous_container_asan_correct(v)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); v.resize(50, 1); Index: test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp +++ test/std/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp @@ -48,7 +48,7 @@ assert(is_contiguous_container_asan_correct(v)); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); v.push_back(1); Index: test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp +++ test/std/containers/sequences/vector/vector.capacity/swap.pass.cpp @@ -32,7 +32,7 @@ assert(v2.capacity() == 100); assert(is_contiguous_container_asan_correct(v2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v1(100); std::vector> v2(200); Index: test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/assign_copy.pass.cpp @@ -32,7 +32,7 @@ assert(l2 == l); assert(l2.get_allocator() == other_allocator(5)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(3, 2, min_allocator()); std::vector > l2(l, min_allocator()); Index: test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp @@ -42,7 +42,7 @@ test(d2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::vector> V; V d1; Index: test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp @@ -76,7 +76,7 @@ assert(l2.get_allocator() == lo.get_allocator()); assert(is_contiguous_container_asan_correct(l2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(min_allocator{}); std::vector > lo(min_allocator{}); Index: test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/assign_size_value.pass.cpp @@ -41,7 +41,7 @@ test(d2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::vector> V; V d1; Index: test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -30,7 +32,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -47,5 +48,4 @@ typedef std::vector> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~vector() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_alloc { @@ -27,11 +27,8 @@ ~some_alloc() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_destructible::value, ""); @@ -48,5 +45,4 @@ typedef std::vector> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } Index: test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/initializer_list.pass.cpp @@ -28,7 +28,7 @@ assert(d[2] == 5); assert(d[3] == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d = {3, 4, 5, 6}; assert(d.size() == 4); Index: test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp @@ -31,7 +31,7 @@ assert(d[2] == 5); assert(d[3] == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d({3, 4, 5, 6}, min_allocator()); assert(d.get_allocator() == min_allocator()); Index: test/std/containers/sequences/vector/vector.cons/move.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/move.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/move.pass.cpp @@ -68,7 +68,7 @@ assert(*j == 3); assert(is_contiguous_container_asan_correct(c2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(min_allocator{}); std::vector > lo(min_allocator{}); Index: test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp @@ -75,7 +75,7 @@ assert(l2.get_allocator() == other_allocator(4)); assert(is_contiguous_container_asan_correct(l2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector > l(min_allocator{}); std::vector > lo(min_allocator{}); Index: test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp @@ -16,6 +16,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -58,7 +60,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -91,6 +92,4 @@ static_assert(!std::is_nothrow_move_assignable::value, ""); } #endif - -#endif } Index: test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp @@ -14,6 +14,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -29,7 +31,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::vector C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -51,5 +52,4 @@ static_assert(!std::is_nothrow_move_constructible::value, ""); #endif } -#endif } Index: test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp +++ test/std/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp @@ -30,7 +30,7 @@ assert(d[2] == 5); assert(d[3] == 6); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d; d = {3, 4, 5, 6}; Index: test/std/containers/sequences/vector/vector.data/data.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.data/data.pass.cpp +++ test/std/containers/sequences/vector/vector.data/data.pass.cpp @@ -29,7 +29,7 @@ assert(v.data() == &v.front()); assert(is_contiguous_container_asan_correct(v)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v; assert(v.data() == 0); Index: test/std/containers/sequences/vector/vector.data/data_const.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.data/data_const.pass.cpp +++ test/std/containers/sequences/vector/vector.data/data_const.pass.cpp @@ -29,7 +29,7 @@ assert(v.data() == &v.front()); assert(is_contiguous_container_asan_correct(v)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { const std::vector> v; assert(v.data() == 0); Index: test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/emplace.pass.cpp @@ -122,7 +122,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> c; std::vector>::iterator i = c.emplace(c.cbegin(), 2, 3.5); Index: test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp @@ -86,7 +86,7 @@ assert(c.back().getd() == 4.5); assert(is_contiguous_container_asan_correct(c)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> c; c.emplace_back(2, 3.5); Index: test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp @@ -38,7 +38,7 @@ assert(v[0] == 3); assert(is_contiguous_container_asan_correct(v)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v; v.reserve(3); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp @@ -45,7 +45,7 @@ assert(distance(l1.begin(), l1.end()) == 0); assert(is_contiguous_container_asan_correct(l1)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::vector> l1(a1, a1+3); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp @@ -31,7 +31,7 @@ l1.erase(i); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::vector> l1(a1, a1+3); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp @@ -32,7 +32,7 @@ l1.erase(i); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::vector> l1(a1, a1+3); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp @@ -72,7 +72,7 @@ assert(is_contiguous_container_asan_correct(outer[0])); assert(is_contiguous_container_asan_correct(outer[1])); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> l1(a1, a1+3); assert(is_contiguous_container_asan_correct(l1)); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp @@ -31,7 +31,7 @@ std::vector::iterator i = l1.erase(l2.cbegin(), l1.cbegin()+1); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::vector> l1(a1, a1+3); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp @@ -31,7 +31,7 @@ std::vector::iterator i = l1.erase(l1.cbegin(), l2.cbegin()+1); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::vector> l1(a1, a1+3); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp @@ -31,7 +31,7 @@ std::vector::iterator i = l1.erase(l2.cbegin(), l2.cbegin()+1); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::vector> l1(a1, a1+3); Index: test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp @@ -30,7 +30,7 @@ std::vector::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin()); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 2, 3}; std::vector> l1(a1, a1+3); Index: test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp @@ -41,7 +41,7 @@ assert(d[12] == 1); assert(d[13] == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> d(10, 1); std::vector>::iterator i = d.insert(d.cbegin() + 2, {3, 4, 5, 6}); Index: test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp @@ -140,7 +140,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); int a[] = {1, 2, 3, 4, 5}; Index: test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp @@ -59,7 +59,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); std::vector>::iterator i = v.insert(v.cbegin() + 10, MoveOnly(3)); Index: test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp @@ -91,7 +91,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); std::vector>::iterator i = v.insert(v.cbegin() + 10, 5, 1); Index: test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp @@ -89,7 +89,7 @@ assert(false); } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> v(100); std::vector>::iterator i = v.insert(v.cbegin() + 10, 1); Index: test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp @@ -39,7 +39,7 @@ assert(false); #endif } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> c; c.push_back(1); Index: test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp @@ -75,7 +75,7 @@ for (int j = 0; j < c.size(); ++j) assert(c[j] == j); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> c; c.push_back(0); Index: test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp +++ test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp @@ -77,7 +77,7 @@ for (int j = 0; j < c.size(); ++j) assert(c[j] == MoveOnly(j)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::vector> c; c.push_back(MoveOnly(0)); Index: test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp +++ test/std/containers/sequences/vector/vector.special/db_swap_1.pass.cpp @@ -37,7 +37,7 @@ c1.erase(i1); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; Index: test/std/containers/sequences/vector/vector.special/swap.pass.cpp =================================================================== --- test/std/containers/sequences/vector/vector.special/swap.pass.cpp +++ test/std/containers/sequences/vector/vector.special/swap.pass.cpp @@ -108,7 +108,7 @@ assert(is_contiguous_container_asan_correct(c1)); assert(is_contiguous_container_asan_correct(c2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { int a1[] = {1, 3, 7, 9, 10}; int a2[] = {0, 2, 4, 5, 6, 8, 11}; Index: test/std/containers/unord/unord.map/bucket.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/bucket.pass.cpp +++ test/std/containers/unord/unord.map/bucket.pass.cpp @@ -45,7 +45,7 @@ for (size_t i = 0; i < 13; ++i) assert(c.bucket(i) == i % bc); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/bucket_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/bucket_size.pass.cpp +++ test/std/containers/unord/unord.map/bucket_size.pass.cpp @@ -47,7 +47,7 @@ assert(c.bucket_size(3) == 1); assert(c.bucket_size(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/count.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/count.pass.cpp +++ test/std/containers/unord/unord.map/count.pass.cpp @@ -41,7 +41,7 @@ assert(c.count(30) == 1); assert(c.count(5) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/eq.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/eq.pass.cpp +++ test/std/containers/unord/unord.map/eq.pass.cpp @@ -91,7 +91,7 @@ assert( (c1 == c2)); assert(!(c1 != c2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/equal_range_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/equal_range_const.pass.cpp +++ test/std/containers/unord/unord.map/equal_range_const.pass.cpp @@ -46,7 +46,7 @@ r = c.equal_range(5); assert(std::distance(r.first, r.second) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp +++ test/std/containers/unord/unord.map/equal_range_non_const.pass.cpp @@ -46,7 +46,7 @@ r = c.equal_range(5); assert(std::distance(r.first, r.second) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/find_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/find_const.pass.cpp +++ test/std/containers/unord/unord.map/find_const.pass.cpp @@ -44,7 +44,7 @@ i = c.find(5); assert(i == c.cend()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/find_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/find_non_const.pass.cpp +++ test/std/containers/unord/unord.map/find_non_const.pass.cpp @@ -44,7 +44,7 @@ i = c.find(5); assert(i == c.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; 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 @@ -66,7 +66,7 @@ assert(std::distance(c.cbegin(), c.cend()) == c.size()); C::const_iterator i; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/local_iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/local_iterators.pass.cpp +++ test/std/containers/unord/unord.map/local_iterators.pass.cpp @@ -220,7 +220,7 @@ assert(i->first == 4); assert(i->second == "four"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/max_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/max_size.pass.cpp +++ test/std/containers/unord/unord.map/max_size.pass.cpp @@ -26,7 +26,7 @@ std::unordered_map u; assert(u.max_size() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::unordered_map, std::equal_to, min_allocator>> u; Index: test/std/containers/unord/unord.map/rehash.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/rehash.pass.cpp +++ test/std/containers/unord/unord.map/rehash.pass.cpp @@ -68,7 +68,7 @@ assert(c.bucket_count() == 31); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/reserve.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/reserve.pass.cpp +++ test/std/containers/unord/unord.map/reserve.pass.cpp @@ -74,7 +74,7 @@ assert(c.bucket_count() >= 16); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/types.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/types.pass.cpp +++ test/std/containers/unord/unord.map/types.pass.cpp @@ -50,7 +50,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp @@ -135,7 +135,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator > A; typedef std::unordered_map= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator > A; typedef std::unordered_map= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator > A; typedef std::unordered_map= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp @@ -67,7 +67,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -43,7 +45,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_map C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -67,5 +68,4 @@ some_comp> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~unordered_map() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -36,11 +36,8 @@ ~some_hash() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_map C; static_assert(std::is_nothrow_destructible::value, ""); @@ -64,5 +61,4 @@ some_comp> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } 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 @@ -59,7 +59,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp @@ -62,7 +62,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp @@ -63,7 +63,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp @@ -65,7 +65,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -66,7 +66,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp @@ -111,7 +111,7 @@ assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair P; typedef min_allocator> A; Index: test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -42,7 +44,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_map C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -66,5 +67,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -39,7 +41,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_map C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -63,5 +64,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } 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 @@ -63,7 +63,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp @@ -66,7 +66,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp @@ -68,7 +68,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp @@ -69,7 +69,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -71,7 +71,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp @@ -47,7 +47,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp @@ -48,7 +48,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp @@ -49,7 +49,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map >, Index: test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp @@ -77,7 +77,7 @@ } assert(c.size() == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.modifiers/clear.pass.cpp @@ -39,7 +39,7 @@ c.clear(); assert(c.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.modifiers/emplace.pass.cpp @@ -49,7 +49,7 @@ assert(r.first->first == 5); assert(r.first->second == Emplaceable(6, 7)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.modifiers/emplace_hint.pass.cpp @@ -51,7 +51,7 @@ assert(r->first == 5); assert(r->second == Emplaceable(6, 7)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.modifiers/erase_range.pass.cpp @@ -58,7 +58,7 @@ assert(c.size() == 0); assert(k == c.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.modifiers/insert_hint_const_lvalue.pass.cpp @@ -52,7 +52,7 @@ assert(r->first == 5.5); assert(r->second == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.modifiers/insert_init.pass.cpp @@ -45,7 +45,7 @@ assert(c.at(3) == "three"); assert(c.at(4) == "four"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp +++ test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp @@ -45,7 +45,7 @@ assert(c.at(3) == "three"); assert(c.at(4) == "four"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_map, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/bucket.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/bucket.pass.cpp +++ test/std/containers/unord/unord.multimap/bucket.pass.cpp @@ -45,7 +45,7 @@ for (size_t i = 0; i < 13; ++i) assert(c.bucket(i) == i % bc); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/bucket_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/bucket_size.pass.cpp +++ test/std/containers/unord/unord.multimap/bucket_size.pass.cpp @@ -49,7 +49,7 @@ assert(c.bucket_size(5) == 0); assert(c.bucket_size(6) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/count.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/count.pass.cpp +++ test/std/containers/unord/unord.multimap/count.pass.cpp @@ -44,7 +44,7 @@ assert(c.count(50) == 3); assert(c.count(5) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp +++ test/std/containers/unord/unord.multimap/db_iterators_7.pass.cpp @@ -36,7 +36,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp +++ test/std/containers/unord/unord.multimap/db_iterators_8.pass.cpp @@ -34,7 +34,7 @@ C::value_type j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp +++ test/std/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp @@ -34,7 +34,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp +++ test/std/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp @@ -33,7 +33,7 @@ C::value_type j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/eq.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/eq.pass.cpp +++ test/std/containers/unord/unord.multimap/eq.pass.cpp @@ -100,7 +100,7 @@ assert( (c1 == c2)); assert(!(c1 != c2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp +++ test/std/containers/unord/unord.multimap/equal_range_const.pass.cpp @@ -57,7 +57,7 @@ assert(r.first->first == 50); assert(r.first->second == "fiftyB"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp +++ test/std/containers/unord/unord.multimap/equal_range_non_const.pass.cpp @@ -57,7 +57,7 @@ assert(r.first->first == 50); assert(r.first->second == "fiftyB"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/find_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/find_const.pass.cpp +++ test/std/containers/unord/unord.multimap/find_const.pass.cpp @@ -44,7 +44,7 @@ i = c.find(5); assert(i == c.cend()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/find_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/find_non_const.pass.cpp +++ test/std/containers/unord/unord.multimap/find_non_const.pass.cpp @@ -44,7 +44,7 @@ i = c.find(5); assert(i == c.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; 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 @@ -69,7 +69,7 @@ assert(std::distance(c.cbegin(), c.cend()) == c.size()); C::const_iterator i; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/load_factor.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/load_factor.pass.cpp +++ test/std/containers/unord/unord.multimap/load_factor.pass.cpp @@ -48,7 +48,7 @@ const C c; assert(c.load_factor() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/local_iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/local_iterators.pass.cpp +++ test/std/containers/unord/unord.multimap/local_iterators.pass.cpp @@ -284,7 +284,7 @@ j = c.cend(b); assert(std::distance(i, j) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp +++ test/std/containers/unord/unord.multimap/max_bucket_count.pass.cpp @@ -30,7 +30,7 @@ const C c; assert(c.max_bucket_count() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp +++ test/std/containers/unord/unord.multimap/max_load_factor.pass.cpp @@ -42,7 +42,7 @@ c.max_load_factor(2.5); assert(c.max_load_factor() == 2.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/max_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/max_size.pass.cpp +++ test/std/containers/unord/unord.multimap/max_size.pass.cpp @@ -26,7 +26,7 @@ std::unordered_multimap u; assert(u.max_size() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::unordered_multimap, std::equal_to, min_allocator>> u; Index: test/std/containers/unord/unord.multimap/rehash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/rehash.pass.cpp +++ test/std/containers/unord/unord.multimap/rehash.pass.cpp @@ -97,7 +97,7 @@ assert(c.bucket_count() == 31); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/reserve.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/reserve.pass.cpp +++ test/std/containers/unord/unord.multimap/reserve.pass.cpp @@ -76,7 +76,7 @@ assert(c.bucket_count() >= 16); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/swap_member.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/swap_member.pass.cpp +++ test/std/containers/unord/unord.multimap/swap_member.pass.cpp @@ -396,7 +396,7 @@ assert(std::distance(c2.cbegin(), c2.cend()) == c2.size()); assert(c2.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_hash > Hash; typedef test_compare > Compare; Index: test/std/containers/unord/unord.multimap/types.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/types.pass.cpp +++ test/std/containers/unord/unord.multimap/types.pass.cpp @@ -50,7 +50,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; 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 @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp @@ -163,7 +163,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator > A; typedef std::unordered_multimap= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator > A; typedef std::unordered_multimap= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator > A; typedef std::unordered_multimap= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp @@ -81,7 +81,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -43,7 +45,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multimap C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -67,5 +68,4 @@ some_comp> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~unordered_multimap() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -36,11 +36,8 @@ ~some_hash() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multimap C; static_assert(std::is_nothrow_destructible::value, ""); @@ -64,5 +61,4 @@ some_comp> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } 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 @@ -81,7 +81,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp @@ -84,7 +84,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp @@ -85,7 +85,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp @@ -87,7 +87,7 @@ assert(c.key_eq() == test_compare >(9)); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -88,7 +88,7 @@ assert(c.key_eq() == test_compare >(9)); assert((c.get_allocator() == test_allocator >(10))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp @@ -128,7 +128,7 @@ assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp @@ -159,7 +159,7 @@ assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::pair P; typedef min_allocator> A; Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -42,7 +44,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multimap C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -66,5 +67,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -39,7 +41,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multimap C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -63,5 +64,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } 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 @@ -85,7 +85,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp @@ -88,7 +88,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp @@ -90,7 +90,7 @@ assert(c.key_eq() == test_compare >()); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp @@ -91,7 +91,7 @@ assert(c.key_eq() == test_compare >(9)); assert((c.get_allocator() == test_allocator >())); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -93,7 +93,7 @@ assert(c.key_eq() == test_compare >(9)); assert((c.get_allocator() == test_allocator >(10))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp @@ -47,7 +47,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp @@ -48,7 +48,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp @@ -49,7 +49,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap >, Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp @@ -39,7 +39,7 @@ c.clear(); assert(c.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp @@ -46,7 +46,7 @@ assert(r->first == 5); assert(r->second == Emplaceable(6, 7)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp @@ -59,7 +59,7 @@ assert(r->first == 3); assert(r->second == Emplaceable(5, 6)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp @@ -76,7 +76,7 @@ assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; @@ -123,7 +123,7 @@ assert(std::distance(c.cbegin(), c.cend()) == c.size()); } #endif -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 { // This is LWG #2059 typedef TemplateConstructor T; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp @@ -21,7 +21,7 @@ #include "min_allocator.h" -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 template bool only_deletions ( const Unordered &whole, const Unordered &part ) { typename Unordered::const_iterator w = whole.begin(); @@ -200,7 +200,7 @@ assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp @@ -98,7 +98,7 @@ assert(c.size() == 0); assert(k == c.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp @@ -47,7 +47,7 @@ assert(r->first == 5.5); assert(r->second == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp @@ -52,7 +52,7 @@ assert(r->first == 5.5); assert(r->second == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp @@ -70,7 +70,7 @@ assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp @@ -70,7 +70,7 @@ assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multimap, std::equal_to, min_allocator>> C; Index: test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp =================================================================== --- test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp +++ test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp @@ -395,7 +395,7 @@ assert(std::distance(c2.cbegin(), c2.cend()) == c2.size()); assert(c2.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_hash > Hash; typedef test_compare > Compare; Index: test/std/containers/unord/unord.multiset/bucket.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/bucket.pass.cpp +++ test/std/containers/unord/unord.multiset/bucket.pass.cpp @@ -44,7 +44,7 @@ for (size_t i = 0; i < 13; ++i) assert(c.bucket(i) == i % bc); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/bucket_count.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/bucket_count.pass.cpp +++ test/std/containers/unord/unord.multiset/bucket_count.pass.cpp @@ -47,7 +47,7 @@ const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 11); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/bucket_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/bucket_size.pass.cpp +++ test/std/containers/unord/unord.multiset/bucket_size.pass.cpp @@ -48,7 +48,7 @@ assert(c.bucket_size(5) == 0); assert(c.bucket_size(6) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/clear.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/clear.pass.cpp +++ test/std/containers/unord/unord.multiset/clear.pass.cpp @@ -38,7 +38,7 @@ c.clear(); assert(c.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/count.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/count.pass.cpp +++ test/std/containers/unord/unord.multiset/count.pass.cpp @@ -43,7 +43,7 @@ assert(c.count(50) == 3); assert(c.count(5) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp +++ test/std/containers/unord/unord.multiset/db_iterators_7.pass.cpp @@ -35,7 +35,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_multiset> C; Index: test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp +++ test/std/containers/unord/unord.multiset/db_iterators_8.pass.cpp @@ -33,7 +33,7 @@ T j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_multiset> C; Index: test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp +++ test/std/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp @@ -34,7 +34,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_multiset> C; Index: test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp +++ test/std/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp @@ -33,7 +33,7 @@ T j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_multiset> C; Index: test/std/containers/unord/unord.multiset/emplace.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/emplace.pass.cpp +++ test/std/containers/unord/unord.multiset/emplace.pass.cpp @@ -41,7 +41,7 @@ assert(c.size() == 3); assert(*r == Emplaceable(5, 6)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp +++ test/std/containers/unord/unord.multiset/emplace_hint.pass.cpp @@ -46,7 +46,7 @@ assert(c.size() == 3); assert(*r == Emplaceable(5, 6)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/eq.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/eq.pass.cpp +++ test/std/containers/unord/unord.multiset/eq.pass.cpp @@ -99,7 +99,7 @@ assert( (c1 == c2)); assert(!(c1 != c2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp +++ test/std/containers/unord/unord.multiset/equal_range_const.pass.cpp @@ -53,7 +53,7 @@ ++r.first; assert(*r.first == 50); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp +++ test/std/containers/unord/unord.multiset/equal_range_non_const.pass.cpp @@ -53,7 +53,7 @@ ++r.first; assert(*r.first == 50); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp +++ test/std/containers/unord/unord.multiset/erase_const_iter.pass.cpp @@ -52,7 +52,7 @@ assert(c.count(3) == 1); assert(c.count(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; @@ -76,7 +76,7 @@ assert(c.count(4) == 1); } #endif -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 { // This is LWG #2059 typedef TemplateConstructor T; Index: test/std/containers/unord/unord.multiset/erase_key.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/erase_key.pass.cpp +++ test/std/containers/unord/unord.multiset/erase_key.pass.cpp @@ -21,7 +21,7 @@ #include "min_allocator.h" -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 template bool only_deletions ( const Unordered &whole, const Unordered &part ) { typename Unordered::const_iterator w = whole.begin(); @@ -95,7 +95,7 @@ assert(c.erase(3) == 0); assert(c.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/erase_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/erase_range.pass.cpp +++ test/std/containers/unord/unord.multiset/erase_range.pass.cpp @@ -55,7 +55,7 @@ assert(c.size() == 0); assert(k == c.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/find_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/find_const.pass.cpp +++ test/std/containers/unord/unord.multiset/find_const.pass.cpp @@ -42,7 +42,7 @@ i = c.find(5); assert(i == c.cend()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/find_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/find_non_const.pass.cpp +++ test/std/containers/unord/unord.multiset/find_non_const.pass.cpp @@ -42,7 +42,7 @@ i = c.find(5); assert(i == c.cend()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp +++ test/std/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp @@ -43,7 +43,7 @@ assert(c.size() == 4); assert(*r == 5.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp +++ test/std/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp @@ -48,7 +48,7 @@ assert(c.size() == 4); assert(*r == 5.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp +++ test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp @@ -73,7 +73,7 @@ assert(*r == 5); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/insert_init.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/insert_init.pass.cpp +++ test/std/containers/unord/unord.multiset/insert_init.pass.cpp @@ -44,7 +44,7 @@ assert(c.count(3) == 1); assert(c.count(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/insert_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/insert_range.pass.cpp +++ test/std/containers/unord/unord.multiset/insert_range.pass.cpp @@ -44,7 +44,7 @@ assert(c.count(3) == 1); assert(c.count(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp +++ test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp @@ -67,7 +67,7 @@ assert(*r == 5); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; 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 @@ -65,7 +65,7 @@ assert(std::distance(c.cbegin(), c.cend()) == c.size()); C::const_iterator i; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/load_factor.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/load_factor.pass.cpp +++ test/std/containers/unord/unord.multiset/load_factor.pass.cpp @@ -47,7 +47,7 @@ const C c; assert(c.load_factor() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/local_iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/local_iterators.pass.cpp +++ test/std/containers/unord/unord.multiset/local_iterators.pass.cpp @@ -259,7 +259,7 @@ j = c.cend(b); assert(std::distance(i, j) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp +++ test/std/containers/unord/unord.multiset/max_bucket_count.pass.cpp @@ -27,7 +27,7 @@ const C c; assert(c.max_bucket_count() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp +++ test/std/containers/unord/unord.multiset/max_load_factor.pass.cpp @@ -41,7 +41,7 @@ c.max_load_factor(2.5); assert(c.max_load_factor() == 2.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/max_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/max_size.pass.cpp +++ test/std/containers/unord/unord.multiset/max_size.pass.cpp @@ -26,7 +26,7 @@ std::unordered_multiset u; assert(u.max_size() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::unordered_multiset, std::equal_to, min_allocator> u; Index: test/std/containers/unord/unord.multiset/rehash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/rehash.pass.cpp +++ test/std/containers/unord/unord.multiset/rehash.pass.cpp @@ -67,7 +67,7 @@ assert(c.bucket_count() == 31); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/reserve.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/reserve.pass.cpp +++ test/std/containers/unord/unord.multiset/reserve.pass.cpp @@ -73,7 +73,7 @@ assert(c.bucket_count() >= 16); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.multiset/swap_member.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/swap_member.pass.cpp +++ test/std/containers/unord/unord.multiset/swap_member.pass.cpp @@ -386,7 +386,7 @@ assert(std::distance(c2.cbegin(), c2.cend()) == c2.size()); assert(c2.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_hash > Hash; typedef test_compare > Compare; Index: test/std/containers/unord/unord.multiset/types.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/types.pass.cpp +++ test/std/containers/unord/unord.multiset/types.pass.cpp @@ -48,7 +48,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset, std::equal_to, min_allocator> C; 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 @@ -43,7 +43,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp @@ -151,7 +151,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef std::unordered_multiset= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef std::unordered_multiset= 201103L +#if TEST_STD_VER >= 11 { typedef test_allocator A; typedef std::unordered_multiset= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp @@ -73,7 +73,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp @@ -43,7 +43,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -43,7 +45,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multiset C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -67,5 +68,4 @@ some_comp> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~unordered_multiset() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -36,11 +36,8 @@ ~some_hash() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multiset C; static_assert(std::is_nothrow_destructible::value, ""); @@ -64,5 +61,4 @@ some_comp> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } 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 @@ -57,7 +57,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp @@ -60,7 +60,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp @@ -62,7 +62,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp @@ -63,7 +63,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -64,7 +64,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp @@ -103,7 +103,7 @@ assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp @@ -118,7 +118,7 @@ assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int P; typedef min_allocator A; Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -42,7 +44,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multiset C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -66,5 +67,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -39,7 +41,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_multiset C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -63,5 +64,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } 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 @@ -60,7 +60,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp @@ -63,7 +63,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp @@ -65,7 +65,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp @@ -66,7 +66,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -68,7 +68,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp @@ -43,7 +43,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp @@ -43,7 +43,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp @@ -46,7 +46,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp @@ -47,7 +47,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_multiset >, Index: test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp =================================================================== --- test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp +++ test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp @@ -386,7 +386,7 @@ assert(std::distance(c2.cbegin(), c2.cend()) == c2.size()); assert(c2.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_hash > Hash; typedef test_compare > Compare; Index: test/std/containers/unord/unord.set/bucket.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/bucket.pass.cpp +++ test/std/containers/unord/unord.set/bucket.pass.cpp @@ -44,7 +44,7 @@ for (size_t i = 0; i < 13; ++i) assert(c.bucket(i) == i % bc); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/bucket_count.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/bucket_count.pass.cpp +++ test/std/containers/unord/unord.set/bucket_count.pass.cpp @@ -47,7 +47,7 @@ const C c(std::begin(a), std::end(a)); assert(c.bucket_count() >= 11); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef C::const_iterator I; Index: test/std/containers/unord/unord.set/bucket_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/bucket_size.pass.cpp +++ test/std/containers/unord/unord.set/bucket_size.pass.cpp @@ -46,7 +46,7 @@ assert(c.bucket_size(3) == 1); assert(c.bucket_size(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/clear.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/clear.pass.cpp +++ test/std/containers/unord/unord.set/clear.pass.cpp @@ -38,7 +38,7 @@ c.clear(); assert(c.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/count.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/count.pass.cpp +++ test/std/containers/unord/unord.set/count.pass.cpp @@ -43,7 +43,7 @@ assert(c.count(50) == 1); assert(c.count(5) == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/db_iterators_7.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/db_iterators_7.pass.cpp +++ test/std/containers/unord/unord.set/db_iterators_7.pass.cpp @@ -35,7 +35,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_set> C; Index: test/std/containers/unord/unord.set/db_iterators_8.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/db_iterators_8.pass.cpp +++ test/std/containers/unord/unord.set/db_iterators_8.pass.cpp @@ -33,7 +33,7 @@ T j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_set> C; Index: test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp +++ test/std/containers/unord/unord.set/db_local_iterators_7.pass.cpp @@ -34,7 +34,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_set> C; Index: test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp +++ test/std/containers/unord/unord.set/db_local_iterators_8.pass.cpp @@ -33,7 +33,7 @@ T j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int T; typedef std::unordered_set> C; Index: test/std/containers/unord/unord.set/emplace.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/emplace.pass.cpp +++ test/std/containers/unord/unord.set/emplace.pass.cpp @@ -44,7 +44,7 @@ assert(*r.first == Emplaceable(5, 6)); assert(!r.second); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/emplace_hint.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/emplace_hint.pass.cpp +++ test/std/containers/unord/unord.set/emplace_hint.pass.cpp @@ -46,7 +46,7 @@ assert(c.size() == 2); assert(*r == Emplaceable(5, 6)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/eq.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/eq.pass.cpp +++ test/std/containers/unord/unord.set/eq.pass.cpp @@ -90,7 +90,7 @@ assert( (c1 == c2)); assert(!(c1 != c2)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/equal_range_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/equal_range_const.pass.cpp +++ test/std/containers/unord/unord.set/equal_range_const.pass.cpp @@ -49,7 +49,7 @@ assert(std::distance(r.first, r.second) == 1); assert(*r.first == 50); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef C::const_iterator I; Index: test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp +++ test/std/containers/unord/unord.set/equal_range_non_const.pass.cpp @@ -49,7 +49,7 @@ assert(std::distance(r.first, r.second) == 1); assert(*r.first == 50); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef C::iterator I; Index: test/std/containers/unord/unord.set/erase_const_iter.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/erase_const_iter.pass.cpp +++ test/std/containers/unord/unord.set/erase_const_iter.pass.cpp @@ -51,7 +51,7 @@ assert(c.count(3) == 1); assert(c.count(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; @@ -73,7 +73,7 @@ assert(c.count(4) == 1); } #endif -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 { // This is LWG #2059 typedef TemplateConstructor T; Index: test/std/containers/unord/unord.set/erase_key.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/erase_key.pass.cpp +++ test/std/containers/unord/unord.set/erase_key.pass.cpp @@ -21,7 +21,7 @@ #include "min_allocator.h" -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 template bool only_deletions ( const Unordered &whole, const Unordered &part ) { typename Unordered::const_iterator w = whole.begin(); @@ -95,7 +95,7 @@ assert(c.erase(3) == 0); assert(c.size() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/erase_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/erase_range.pass.cpp +++ test/std/containers/unord/unord.set/erase_range.pass.cpp @@ -55,7 +55,7 @@ assert(c.size() == 0); assert(k == c.end()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/find_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/find_const.pass.cpp +++ test/std/containers/unord/unord.set/find_const.pass.cpp @@ -42,7 +42,7 @@ i = c.find(5); assert(i == c.cend()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/find_non_const.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/find_non_const.pass.cpp +++ test/std/containers/unord/unord.set/find_non_const.pass.cpp @@ -42,7 +42,7 @@ i = c.find(5); assert(i == c.cend()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; typedef int P; Index: test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp +++ test/std/containers/unord/unord.set/insert_const_lvalue.pass.cpp @@ -47,7 +47,7 @@ assert(*r.first == 5.5); assert(r.second); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp +++ test/std/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp @@ -48,7 +48,7 @@ assert(c.size() == 3); assert(*r == 5.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp +++ test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp @@ -73,7 +73,7 @@ assert(*r == 5); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/insert_init.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/insert_init.pass.cpp +++ test/std/containers/unord/unord.set/insert_init.pass.cpp @@ -44,7 +44,7 @@ assert(c.count(3) == 1); assert(c.count(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/insert_range.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/insert_range.pass.cpp +++ test/std/containers/unord/unord.set/insert_range.pass.cpp @@ -44,7 +44,7 @@ assert(c.count(3) == 1); assert(c.count(4) == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/insert_rvalue.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/insert_rvalue.pass.cpp +++ test/std/containers/unord/unord.set/insert_rvalue.pass.cpp @@ -75,7 +75,7 @@ assert(r.second); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; 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 @@ -65,7 +65,7 @@ assert(std::distance(c.cbegin(), c.cend()) == c.size()); C::const_iterator i; } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/load_factor.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/load_factor.pass.cpp +++ test/std/containers/unord/unord.set/load_factor.pass.cpp @@ -47,7 +47,7 @@ const C c; assert(c.load_factor() == 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/local_iterators.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/local_iterators.pass.cpp +++ test/std/containers/unord/unord.set/local_iterators.pass.cpp @@ -203,7 +203,7 @@ assert(std::distance(i, j) == 1); assert(*i == 4); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/max_bucket_count.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/max_bucket_count.pass.cpp +++ test/std/containers/unord/unord.set/max_bucket_count.pass.cpp @@ -27,7 +27,7 @@ const C c; assert(c.max_bucket_count() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/max_load_factor.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/max_load_factor.pass.cpp +++ test/std/containers/unord/unord.set/max_load_factor.pass.cpp @@ -41,7 +41,7 @@ c.max_load_factor(2.5); assert(c.max_load_factor() == 2.5); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/max_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/max_size.pass.cpp +++ test/std/containers/unord/unord.set/max_size.pass.cpp @@ -26,7 +26,7 @@ std::unordered_set u; assert(u.max_size() > 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { std::unordered_set, std::equal_to, min_allocator> u; Index: test/std/containers/unord/unord.set/rehash.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/rehash.pass.cpp +++ test/std/containers/unord/unord.set/rehash.pass.cpp @@ -67,7 +67,7 @@ assert(c.bucket_count() == 31); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/reserve.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/reserve.pass.cpp +++ test/std/containers/unord/unord.set/reserve.pass.cpp @@ -73,7 +73,7 @@ assert(c.bucket_count() >= 16); test(c); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; Index: test/std/containers/unord/unord.set/swap_member.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/swap_member.pass.cpp +++ test/std/containers/unord/unord.set/swap_member.pass.cpp @@ -386,7 +386,7 @@ assert(std::distance(c2.cbegin(), c2.cend()) == c2.size()); assert(c2.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_hash > Hash; typedef test_compare > Compare; Index: test/std/containers/unord/unord.set/types.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/types.pass.cpp +++ test/std/containers/unord/unord.set/types.pass.cpp @@ -48,7 +48,7 @@ static_assert((std::is_same::value), ""); static_assert((std::is_same::value), ""); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set, std::equal_to, min_allocator> C; 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 @@ -43,7 +43,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp @@ -134,7 +134,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef std::unordered_set= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef std::unordered_set= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef std::unordered_set= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp @@ -65,7 +65,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp @@ -43,7 +43,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -43,7 +45,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_set C; static_assert(std::is_nothrow_default_constructible::value, ""); @@ -67,5 +68,4 @@ some_comp> C; static_assert(!std::is_nothrow_default_constructible::value, ""); } -#endif } Index: test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp @@ -11,14 +11,14 @@ // ~unordered_set() // implied noexcept; +// UNSUPPORTED: c++98, c++03 + #include #include #include "MoveOnly.h" #include "test_allocator.h" -#if __has_feature(cxx_noexcept) - template struct some_comp { @@ -36,11 +36,8 @@ ~some_hash() noexcept(false); }; -#endif - int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_set C; static_assert(std::is_nothrow_destructible::value, ""); @@ -64,5 +61,4 @@ some_comp> C; static_assert(!std::is_nothrow_destructible::value, ""); } -#endif } 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 @@ -57,7 +57,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp @@ -60,7 +60,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp @@ -62,7 +62,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp @@ -63,7 +63,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -64,7 +64,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp @@ -103,7 +103,7 @@ assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp @@ -110,7 +110,7 @@ assert(c0.empty()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef int P; typedef min_allocator A; Index: test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp @@ -17,6 +17,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -42,7 +44,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_set C; static_assert(std::is_nothrow_move_assignable::value, ""); @@ -66,5 +67,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -#endif } Index: test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp @@ -15,6 +15,8 @@ // This tests a conforming extension +// UNSUPPORTED: c++98, c++03 + #include #include @@ -39,7 +41,6 @@ int main() { -#if __has_feature(cxx_noexcept) { typedef std::unordered_set C; static_assert(std::is_nothrow_move_constructible::value, ""); @@ -63,5 +64,4 @@ some_comp> C; static_assert(!std::is_nothrow_move_constructible::value, ""); } -#endif } 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 @@ -60,7 +60,7 @@ assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp @@ -63,7 +63,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp @@ -65,7 +65,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp @@ -66,7 +66,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -68,7 +68,7 @@ assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp @@ -43,7 +43,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp @@ -45,7 +45,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp @@ -46,7 +46,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp @@ -47,7 +47,7 @@ assert(c.load_factor() == 0); assert(c.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::unordered_set >, Index: test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp =================================================================== --- test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp +++ test/std/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp @@ -386,7 +386,7 @@ assert(std::distance(c2.cbegin(), c2.cend()) == c2.size()); assert(c2.max_load_factor() == 1); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef test_hash > Hash; typedef test_compare > Compare; Index: test/std/depr/depr.c.headers/stdarg_h.pass.cpp =================================================================== --- test/std/depr/depr.c.headers/stdarg_h.pass.cpp +++ test/std/depr/depr.c.headers/stdarg_h.pass.cpp @@ -11,11 +11,13 @@ #include +#include "test_macros.h" + #ifndef va_arg #error va_arg not defined #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 # ifndef va_copy # error va_copy is not defined when c++ >= 11 # endif Index: test/std/experimental/string.view/string.view.access/back.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.access/back.pass.cpp +++ test/std/experimental/string.view/string.view.access/back.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + template bool test ( const CharT *s, size_t len ) { std::experimental::basic_string_view sv ( s, len ); @@ -30,7 +32,7 @@ assert ( test ( L"ABCDE", 5 )); assert ( test ( L"a", 1 )); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert ( test ( u"ABCDE", 5 )); assert ( test ( u"a", 1 )); @@ -38,7 +40,7 @@ assert ( test ( U"a", 1 )); #endif -#if __cplusplus >= 201103L +#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.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 @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s, size_t len ) { std::experimental::basic_string_view sv ( s, len ); @@ -29,7 +31,7 @@ test ( L"ABCDE", 5 ); test ( L"a", 1 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDE", 5 ); test ( u"a", 1 ); Index: test/std/experimental/string.view/string.view.access/front.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.access/front.pass.cpp +++ test/std/experimental/string.view/string.view.access/front.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + template bool test ( const CharT *s, size_t len ) { std::experimental::basic_string_view sv ( s, len ); @@ -30,7 +32,7 @@ assert ( test ( L"ABCDE", 5 )); assert ( test ( L"a", 1 )); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert ( test ( u"ABCDE", 5 )); assert ( test ( u"a", 1 )); @@ -38,7 +40,7 @@ assert ( test ( U"a", 1 )); #endif -#if __cplusplus >= 201103L +#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.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 @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s, size_t len ) { std::experimental::basic_string_view sv ( s, len ); @@ -32,7 +34,7 @@ test ( L"ABCDE", 5 ); test ( L"a", 1 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDE", 5 ); test ( u"a", 1 ); 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 @@ -19,6 +19,8 @@ #include #include +#include "test_macros.h" + template void test1 () { #if _LIBCPP_STD_VER > 11 @@ -73,7 +75,7 @@ test2 ( L"a", 1 ); test2 ( L"", 0 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test2 ( u"ABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDE", 105 ); test2 ( u"ABCDE", 5 ); test2 ( u"a", 1 ); 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 @@ -45,7 +45,7 @@ test ( L"A" ); test ( L"" ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"QBCDE" ); test ( u"A" ); test ( u"" ); 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 @@ -18,6 +18,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s, size_t sz ) { { @@ -53,7 +55,7 @@ } #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"QBCDE", 5 ); test ( u"QBCDE", 2 ); test ( u"", 0 ); Index: test/std/experimental/string.view/string.view.cons/from_string.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.cons/from_string.pass.cpp +++ test/std/experimental/string.view/string.view.cons/from_string.pass.cpp @@ -18,6 +18,8 @@ #include #include +#include "test_macros.h" + struct dummy_char_traits : public std::char_traits {}; template @@ -37,7 +39,7 @@ test ( std::wstring(L"") ); test ( std::wstring() ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( std::u16string{u"QBCDE"} ); test ( std::u16string{u""} ); test ( std::u16string{} ); 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 @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + template void test(S s) @@ -51,7 +53,7 @@ test(wstring_view ()); test(string_view ( "123")); test(wstring_view (L"123")); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test(u16string_view{u"123"}); test(u32string_view{U"123"}); #endif 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 @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + template void test(S s) @@ -59,7 +61,7 @@ test(wstring_view ()); test(string_view ( "123")); test(wstring_view (L"123")); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test(u16string_view{u"123"}); test(u32string_view{U"123"}); #endif Index: test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp +++ test/std/experimental/string.view/string.view.iterators/rbegin.pass.cpp @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + template void test(S s) @@ -52,7 +54,7 @@ test(wstring_view ()); test(string_view ( "123")); test(wstring_view (L"123")); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test(u16string_view{u"123"}); test(u32string_view{U"123"}); #endif Index: test/std/experimental/string.view/string.view.iterators/rend.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.iterators/rend.pass.cpp +++ test/std/experimental/string.view/string.view.iterators/rend.pass.cpp @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + template void test(S s) @@ -59,7 +61,7 @@ test(wstring_view ()); test(string_view ( "123")); test(wstring_view (L"123")); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test(u16string_view{u"123"}); test(u32string_view{U"123"}); #endif 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 @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s, size_t len ) { typedef std::experimental::basic_string_view SV; @@ -48,7 +50,7 @@ test ( L"a", 1 ); test ( L"", 0 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDE", 5 ); test ( u"a", 1 ); test ( u"", 0 ); 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 @@ -16,6 +16,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s, size_t len ) { typedef std::experimental::basic_string_view SV; @@ -55,7 +57,7 @@ test ( L"a", 1 ); test ( L"", 0 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDE", 5 ); test ( u"a", 1 ); test ( u"", 0 ); 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 @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s, size_t len ) { typedef std::experimental::basic_string_view SV; @@ -55,7 +57,7 @@ test ( L"a", 1 ); test ( L"", 0 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDE", 5 ); test ( u"a", 1 ); test ( u"", 0 ); 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 @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s, size_t len ) { typedef std::experimental::basic_string_view SV; @@ -54,7 +56,7 @@ test ( L"a", 1 ); test ( L"", 0 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDE", 5 ); test ( u"a", 1 ); test ( u"", 0 ); Index: test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp +++ test/std/experimental/string.view/string.view.ops/basic_string.pass.cpp @@ -16,6 +16,8 @@ #include #include +#include "test_macros.h" + template void test ( const CharT *s ) { typedef std::experimental::basic_string_view string_view_t; @@ -49,7 +51,7 @@ test ( L"a" ); test ( L"" ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDE" ); test ( u"ABCDE" ); test ( u"a" ); 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 @@ -72,7 +72,7 @@ test(L"abcdefghijklmnopqrst", L"abcdefghijklmnopqrst", 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { test(U"", U"", 0); test(U"", U"abcde", -5); 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 @@ -70,7 +70,7 @@ test(L"abcdefghijklmnopqrst", L"abcdefghij", 10); test(L"abcdefghijklmnopqrst", L"abcdefghijklmnopqrst", 0); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test(u"", u"", 0); test(u"", u"abcde", -5); test(u"", u"abcdefghij", -10); Index: test/std/experimental/string.view/string.view.ops/to_string.pass.cpp =================================================================== --- test/std/experimental/string.view/string.view.ops/to_string.pass.cpp +++ test/std/experimental/string.view/string.view.ops/to_string.pass.cpp @@ -30,7 +30,7 @@ assert ( sv1.size() == str1.size ()); assert ( std::char_traits::compare ( sv1.data(), str1.data(), sv1.size()) == 0 ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 auto str2 = sv1.to_string(min_allocator()); assert ( sv1.size() == str2.size ()); assert ( std::char_traits::compare ( sv1.data(), str2.data(), sv1.size()) == 0 ); @@ -44,7 +44,7 @@ assert ( sv1.size() == 0); assert ( sv1.size() == str1.size ()); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 auto str2 = sv1.to_string(min_allocator()); assert ( sv1.size() == str2.size ()); #endif @@ -62,7 +62,7 @@ test ( L"a" ); test ( L"" ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test ( u"ABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDE" ); test ( u"ABCDE" ); test ( u"a" ); Index: test/std/iterators/iterator.container/data.pass.cpp =================================================================== --- test/std/iterators/iterator.container/data.pass.cpp +++ test/std/iterators/iterator.container/data.pass.cpp @@ -13,7 +13,9 @@ // template constexpr T* data(T (&array)[N]) noexcept; // C++17 // template constexpr const E* data(initializer_list il) noexcept; // C++17 -#if __cplusplus <= 201402L +#include "test_macros.h" + +#if TEST_STD_VER <= 14 int main () {} #else Index: test/std/iterators/iterator.container/empty.pass.cpp =================================================================== --- test/std/iterators/iterator.container/empty.pass.cpp +++ test/std/iterators/iterator.container/empty.pass.cpp @@ -12,7 +12,9 @@ // template constexpr bool empty(const T (&array)[N]) noexcept; // C++17 // template constexpr bool empty(initializer_list il) noexcept; // C++17 -#if __cplusplus <= 201402L +#include "test_macros.h" + +#if TEST_STD_VER <= 14 int main () {} #else Index: test/std/iterators/iterator.container/size.pass.cpp =================================================================== --- test/std/iterators/iterator.container/size.pass.cpp +++ test/std/iterators/iterator.container/size.pass.cpp @@ -11,7 +11,9 @@ // template constexpr auto size(const C& c) -> decltype(c.size()); // C++17 // template constexpr size_t size(const T (&array)[N]) noexcept; // C++17 -#if __cplusplus <= 201402L +#include "test_macros.h" + +#if TEST_STD_VER <= 14 int main () {} #else 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 @@ -15,7 +15,9 @@ // template reverse_iterator rbegin(initializer_list il); // template reverse_iterator rend(initializer_list il); -#if __cplusplus >= 201103L +#include "test_macros.h" + +#if TEST_STD_VER >= 11 #include #include #include Index: test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp =================================================================== --- test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp +++ test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp @@ -16,11 +16,13 @@ #include #include +#include "test_macros.h" + struct S { S(); }; // not constexpr int main() { -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { constexpr std::istream_iterator it; } Index: test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp =================================================================== --- test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp +++ test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp @@ -16,13 +16,15 @@ #include #include +#include "test_macros.h" + int main() { { typedef std::istream_iterator T; T it; assert(it == T()); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 constexpr T it2; #endif } Index: test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp =================================================================== --- test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp +++ test/std/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp @@ -20,13 +20,15 @@ #include #include +#include "test_macros.h" + int main() { { typedef std::istreambuf_iterator T; T it; assert(it == T()); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 constexpr T it2; #endif } @@ -34,7 +36,7 @@ typedef std::istreambuf_iterator T; T it; assert(it == T()); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 constexpr T it2; #endif } Index: test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp =================================================================== --- test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp +++ test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp @@ -18,6 +18,8 @@ #include #include +#include "test_macros.h" + class A { int data_; @@ -37,7 +39,7 @@ friend bool operator==(const B& x, const B& y) {return x.data_ == y.data_;} }; -#if __cplusplus > 201103L +#if TEST_STD_VER > 11 struct Final final {}; #endif @@ -105,7 +107,7 @@ assert(i == 7); } } -#if __cplusplus > 201103L +#if TEST_STD_VER > 11 { try { Index: test/std/language.support/support.runtime/cstdarg.pass.cpp =================================================================== --- test/std/language.support/support.runtime/cstdarg.pass.cpp +++ test/std/language.support/support.runtime/cstdarg.pass.cpp @@ -11,11 +11,13 @@ #include +#include "test_macros.h" + #ifndef va_arg #error va_arg not defined #endif -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 # ifndef va_copy # error va_copy is not defined when c++ >= 11 # endif Index: test/std/language.support/support.types/offsetof.pass.cpp =================================================================== --- test/std/language.support/support.types/offsetof.pass.cpp +++ test/std/language.support/support.types/offsetof.pass.cpp @@ -7,8 +7,12 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + #include +#include "test_macros.h" + #ifndef offsetof #error offsetof not defined #endif @@ -20,7 +24,5 @@ int main() { -#if (__has_feature(cxx_noexcept)) static_assert(noexcept(offsetof(A, x)), ""); -#endif } Index: test/std/strings/basic.string/string.access/at.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/at.pass.cpp +++ test/std/strings/basic.string/string.access/at.pass.cpp @@ -46,7 +46,7 @@ test(S("123"), 2); test(S("123"), 3); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(), 0); Index: test/std/strings/basic.string/string.access/back.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/back.pass.cpp +++ test/std/strings/basic.string/string.access/back.pass.cpp @@ -39,7 +39,7 @@ test(S("1")); test(S("1234567890123456789012345678901234567890")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S("1")); Index: test/std/strings/basic.string/string.access/db_back.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/db_back.pass.cpp +++ test/std/strings/basic.string/string.access/db_back.pass.cpp @@ -33,7 +33,7 @@ assert(s.back() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s(1, '\0'); Index: test/std/strings/basic.string/string.access/db_cback.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/db_cback.pass.cpp +++ test/std/strings/basic.string/string.access/db_cback.pass.cpp @@ -31,7 +31,7 @@ assert(s.back() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; const S s; Index: test/std/strings/basic.string/string.access/db_cfront.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/db_cfront.pass.cpp +++ test/std/strings/basic.string/string.access/db_cfront.pass.cpp @@ -31,7 +31,7 @@ assert(s.front() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; const S s; Index: test/std/strings/basic.string/string.access/db_cindex.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/db_cindex.pass.cpp +++ test/std/strings/basic.string/string.access/db_cindex.pass.cpp @@ -32,7 +32,7 @@ assert(s[1] == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; const S s; Index: test/std/strings/basic.string/string.access/db_front.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/db_front.pass.cpp +++ test/std/strings/basic.string/string.access/db_front.pass.cpp @@ -33,7 +33,7 @@ assert(s.front() == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s(1, '\0'); Index: test/std/strings/basic.string/string.access/db_index.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/db_index.pass.cpp +++ test/std/strings/basic.string/string.access/db_index.pass.cpp @@ -32,7 +32,7 @@ assert(s[1] == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s; Index: test/std/strings/basic.string/string.access/front.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/front.pass.cpp +++ test/std/strings/basic.string/string.access/front.pass.cpp @@ -39,7 +39,7 @@ test(S("1")); test(S("1234567890123456789012345678901234567890")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S("1")); Index: test/std/strings/basic.string/string.access/index.pass.cpp =================================================================== --- test/std/strings/basic.string/string.access/index.pass.cpp +++ test/std/strings/basic.string/string.access/index.pass.cpp @@ -36,7 +36,7 @@ const S s2 = S(); assert(s2[0] == '\0'); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s("0123456789"); Index: test/std/strings/basic.string/string.capacity/capacity.pass.cpp =================================================================== --- test/std/strings/basic.string/string.capacity/capacity.pass.cpp +++ test/std/strings/basic.string/string.capacity/capacity.pass.cpp @@ -49,7 +49,7 @@ s.erase(50); test(s); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s; Index: test/std/strings/basic.string/string.capacity/clear.pass.cpp =================================================================== --- test/std/strings/basic.string/string.capacity/clear.pass.cpp +++ test/std/strings/basic.string/string.capacity/clear.pass.cpp @@ -39,7 +39,7 @@ s.erase(50); test(s); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s; Index: test/std/strings/basic.string/string.capacity/empty.pass.cpp =================================================================== --- test/std/strings/basic.string/string.capacity/empty.pass.cpp +++ test/std/strings/basic.string/string.capacity/empty.pass.cpp @@ -31,7 +31,7 @@ test(S("123")); test(S("12345678901234567890123456789012345678901234567890")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.capacity/length.pass.cpp =================================================================== --- test/std/strings/basic.string/string.capacity/length.pass.cpp +++ test/std/strings/basic.string/string.capacity/length.pass.cpp @@ -31,7 +31,7 @@ test(S("123")); test(S("12345678901234567890123456789012345678901234567890")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.capacity/max_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.capacity/max_size.pass.cpp +++ test/std/strings/basic.string/string.capacity/max_size.pass.cpp @@ -63,7 +63,7 @@ test(S("123")); test(S("12345678901234567890123456789012345678901234567890")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp +++ test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp @@ -37,7 +37,7 @@ test(S("123")); test(S("12345678901234567890123456789012345678901234567890")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.capacity/size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.capacity/size.pass.cpp +++ test/std/strings/basic.string/string.capacity/size.pass.cpp @@ -31,7 +31,7 @@ test(S("123"), 3); test(S("12345678901234567890123456789012345678901234567890"), 50); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(), 0); Index: test/std/strings/basic.string/string.iterators/begin.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/begin.pass.cpp +++ test/std/strings/basic.string/string.iterators/begin.pass.cpp @@ -38,7 +38,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.iterators/cbegin.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/cbegin.pass.cpp +++ test/std/strings/basic.string/string.iterators/cbegin.pass.cpp @@ -35,7 +35,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.iterators/cend.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/cend.pass.cpp +++ test/std/strings/basic.string/string.iterators/cend.pass.cpp @@ -31,7 +31,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.iterators/crbegin.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/crbegin.pass.cpp +++ test/std/strings/basic.string/string.iterators/crbegin.pass.cpp @@ -35,7 +35,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.iterators/crend.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/crend.pass.cpp +++ test/std/strings/basic.string/string.iterators/crend.pass.cpp @@ -31,7 +31,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp +++ test/std/strings/basic.string/string.iterators/db_iterators_2.pass.cpp @@ -32,7 +32,7 @@ bool b = s1.begin() < s2.begin(); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s1; Index: test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp +++ test/std/strings/basic.string/string.iterators/db_iterators_3.pass.cpp @@ -32,7 +32,7 @@ int i = s1.begin() - s2.begin(); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s1; Index: test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp +++ test/std/strings/basic.string/string.iterators/db_iterators_4.pass.cpp @@ -33,7 +33,7 @@ assert(i[1] == 0); assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> C; C c(1, '\0'); Index: test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp +++ test/std/strings/basic.string/string.iterators/db_iterators_5.pass.cpp @@ -35,7 +35,7 @@ i += 2; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> C; C c(1, '\0'); Index: test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp +++ test/std/strings/basic.string/string.iterators/db_iterators_6.pass.cpp @@ -34,7 +34,7 @@ --i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> C; C c(1, '\0'); Index: test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp +++ test/std/strings/basic.string/string.iterators/db_iterators_7.pass.cpp @@ -34,7 +34,7 @@ ++i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> C; C c(1, '\0'); Index: test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp +++ test/std/strings/basic.string/string.iterators/db_iterators_8.pass.cpp @@ -32,7 +32,7 @@ char j = *i; assert(false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> C; C c(1, '\0'); Index: test/std/strings/basic.string/string.iterators/end.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/end.pass.cpp +++ test/std/strings/basic.string/string.iterators/end.pass.cpp @@ -40,7 +40,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.iterators/rbegin.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/rbegin.pass.cpp +++ test/std/strings/basic.string/string.iterators/rbegin.pass.cpp @@ -38,7 +38,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.iterators/rend.pass.cpp =================================================================== --- test/std/strings/basic.string/string.iterators/rend.pass.cpp +++ test/std/strings/basic.string/string.iterators/rend.pass.cpp @@ -40,7 +40,7 @@ test(S()); test(S("123")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S()); Index: test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp @@ -48,7 +48,7 @@ assert(in.eof()); assert(s == L" ghij"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; std::istringstream in(" abc\n def\n ghij"); Index: test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp @@ -54,7 +54,7 @@ assert(in.eof()); assert(s == L" ghij"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; std::istringstream in(" abc* def** ghij"); Index: test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp @@ -33,7 +33,7 @@ getline(std::wistringstream(L" abc* def* ghij"), s, L'*'); assert(s == L" abc"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s("initial text"); Index: test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp @@ -33,7 +33,7 @@ getline(std::wistringstream(L" abc\n def\n ghij"), s); assert(s == L" abc"); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; S s("initial text"); Index: test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp @@ -66,7 +66,7 @@ in >> s; assert(in.fail()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; std::istringstream in("a bc defghij"); Index: test/std/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp @@ -52,7 +52,7 @@ assert(out.good()); assert(L" " + s == out.str()); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; std::basic_ostringstream out; Index: test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp @@ -45,7 +45,7 @@ test("abcdefghijklmnopqrst", S("abcdefghij"), true); test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test("", S(""), false); Index: test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp @@ -45,7 +45,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghij", true); test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), "", false); Index: test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp @@ -46,7 +46,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghij"), true); test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), S(""), false); Index: test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp @@ -59,7 +59,7 @@ #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0('a', S(""), S("a")); Index: test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp @@ -83,7 +83,7 @@ #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0("", S(""), S("")); Index: test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp @@ -59,7 +59,7 @@ #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(S(""), '1', S("1")); Index: test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp @@ -83,7 +83,7 @@ #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(S(""), "", S("")); Index: test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp @@ -143,7 +143,7 @@ #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(S(""), S(""), S("")); Index: test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp @@ -45,7 +45,7 @@ test("abcdefghijklmnopqrst", S("abcdefghij"), false); test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test("", S(""), true); Index: test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp @@ -45,7 +45,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghij", false); test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), "", true); Index: test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp @@ -46,7 +46,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghij"), false); test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), S(""), true); Index: test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp @@ -45,7 +45,7 @@ test("abcdefghijklmnopqrst", S("abcdefghij"), true); test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test("", S(""), false); Index: test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp @@ -45,7 +45,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghij", true); test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), "", false); Index: test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp @@ -46,7 +46,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghij"), true); test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), S(""), false); Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp @@ -45,7 +45,7 @@ test("abcdefghijklmnopqrst", S("abcdefghij"), true); test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test("", S(""), true); Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp @@ -45,7 +45,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghij", true); test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), "", true); Index: test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp @@ -46,7 +46,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghij"), true); test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), S(""), true); Index: test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp @@ -45,7 +45,7 @@ test("abcdefghijklmnopqrst", S("abcdefghij"), false); test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test("", S(""), false); Index: test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp @@ -45,7 +45,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghij", false); test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), "", false); Index: test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp @@ -46,7 +46,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghij"), false); test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), S(""), false); Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp @@ -45,7 +45,7 @@ test("abcdefghijklmnopqrst", S("abcdefghij"), false); test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test("", S(""), true); Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp @@ -45,7 +45,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghij", false); test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), "", true); Index: test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp +++ test/std/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp @@ -46,7 +46,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghij"), false); test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), S(""), true); Index: test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp +++ test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp @@ -40,7 +40,7 @@ test(S("abcdefghij")); test(S("abcdefghijklmnopqrst")); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S("")); Index: test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp +++ test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp @@ -34,7 +34,7 @@ test(S("abcdefghij", A(2)), A(2)); test(S("abcdefghijklmnopqrst", A(3)), A(3)); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef std::basic_string, A> S; Index: test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp +++ test/std/strings/basic.string/string.ops/string_compare/pointer.pass.cpp @@ -53,7 +53,7 @@ test(S("abcdefghijklmnopqrst"), "abcdefghij", 10); test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), "", 0); Index: test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp +++ test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp @@ -362,7 +362,7 @@ test1(); test2(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp @@ -1304,7 +1304,7 @@ test10(); test11(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp +++ test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp @@ -362,7 +362,7 @@ test1(); test2(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp @@ -5885,7 +5885,7 @@ test54(); test55(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp +++ test/std/strings/basic.string/string.ops/string_compare/string.pass.cpp @@ -53,7 +53,7 @@ test(S("abcdefghijklmnopqrst"), S("abcdefghij"), 10); test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), S(""), 0); Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp @@ -67,7 +67,7 @@ test(S("gfsmthlkon"), 'q', 0); test(S("laenfsbridchgotmkqpj"), 'q', 0); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), 'q', 0, S::npos); Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp @@ -148,7 +148,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp @@ -375,7 +375,7 @@ test2(); test3(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp @@ -147,7 +147,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp @@ -65,7 +65,7 @@ test(S("gfsmthlkon"), 'e', S::npos); test(S("laenfsbridchgotmkqpj"), 'e', 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), 'e', 0, S::npos); Index: test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp @@ -148,7 +148,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp @@ -375,7 +375,7 @@ test2(); test3(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp @@ -147,7 +147,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp @@ -65,7 +65,7 @@ test(S("gfsmthlkon"), 'i', 9); test(S("laenfsbridchgotmkqpj"), 'i', 19); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), 'i', 0, S::npos); Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp @@ -148,7 +148,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp @@ -375,7 +375,7 @@ test2(); test3(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp @@ -147,7 +147,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp @@ -65,7 +65,7 @@ test(S("gfsmthlkon"), 'm', 3); test(S("laenfsbridchgotmkqpj"), 'm', 15); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), 'm', 0, S::npos); Index: test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp @@ -148,7 +148,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp @@ -375,7 +375,7 @@ test2(); test3(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp @@ -147,7 +147,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find/char_size.pass.cpp @@ -65,7 +65,7 @@ test(S("abcdeabcde"), 'c', 2); test(S("abcdeabcdeabcdeabcde"), 'c', 2); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), 'c', 0, S::npos); Index: test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp @@ -154,7 +154,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp @@ -375,7 +375,7 @@ test2(); test3(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_find/string_size.pass.cpp @@ -147,7 +147,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp @@ -65,7 +65,7 @@ test(S("abcdeabcde"), 'b', 6); test(S("abcdeabcdeabcdeabcde"), 'b', 16); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test(S(""), 'b', 0, S::npos); Index: test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp @@ -155,7 +155,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp @@ -375,7 +375,7 @@ test2(); test3(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp =================================================================== --- test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp +++ test/std/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp @@ -147,7 +147,7 @@ test0(); test1(); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef std::basic_string, min_allocator> S; test0(); Index: test/std/strings/basic.string/string.require/contiguous.pass.cpp =================================================================== --- test/std/strings/basic.string/string.require/contiguous.pass.cpp +++ test/std/strings/basic.string/string.require/contiguous.pass.cpp @@ -41,7 +41,7 @@ test_contiguous(S("1", A(5))); test_contiguous(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7))); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator A; typedef std::basic_string, A> S; Index: test/std/strings/basic.string/types.pass.cpp =================================================================== --- test/std/strings/basic.string/types.pass.cpp +++ test/std/strings/basic.string/types.pass.cpp @@ -79,7 +79,7 @@ std::char_traits >::value), ""); static_assert((std::is_same::allocator_type, std::allocator >::value), ""); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test, min_allocator >(); #endif } Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 char16_t c = u'\0'; std::char_traits::assign(c, u'a'); assert(c == u'a'); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::compare(u"", u"", 0) == 0); assert(std::char_traits::compare(NULL, NULL, 0) == 0); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 char16_t c = u'\0'; assert(std::char_traits::eq(u'a', u'a')); assert(!std::char_traits::eq(u'a', u'A')); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert( std::char_traits::eq_int_type(u'a', u'a')); assert(!std::char_traits::eq_int_type(u'a', u'A')); assert(!std::char_traits::eq_int_type(std::char_traits::eof(), u'A')); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::length(u"") == 0); assert(std::char_traits::length(u"a") == 1); assert(std::char_traits::length(u"aa") == 2); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 char16_t c = u'\0'; assert(!std::char_traits::lt(u'a', u'a')); assert( std::char_traits::lt(u'A', u'a')); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::not_eof(u'a') == u'a'); assert(std::char_traits::not_eof(u'A') == u'A'); #endif Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::to_char_type(u'a') == u'a'); assert(std::char_traits::to_char_type(u'A') == u'A'); #endif Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::to_int_type(u'a') == u'a'); assert(std::char_traits::to_int_type(u'A') == u'A'); #endif Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 char32_t c = U'\0'; std::char_traits::assign(c, U'a'); assert(c == U'a'); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::compare(U"", U"", 0) == 0); assert(std::char_traits::compare(NULL, NULL, 0) == 0); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 char32_t c = U'\0'; assert(std::char_traits::eq(U'a', U'a')); assert(!std::char_traits::eq(U'a', U'A')); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert( std::char_traits::eq_int_type(U'a', U'a')); assert(!std::char_traits::eq_int_type(U'a', U'A')); assert(!std::char_traits::eq_int_type(std::char_traits::eof(), U'A')); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::length(U"") == 0); assert(std::char_traits::length(U"a") == 1); assert(std::char_traits::length(U"aa") == 2); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 char32_t c = U'\0'; assert(!std::char_traits::lt(U'a', U'a')); assert( std::char_traits::lt(U'A', U'a')); Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::not_eof(U'a') == U'a'); assert(std::char_traits::not_eof(U'A') == U'A'); #endif Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::to_char_type(U'a') == U'a'); assert(std::char_traits::to_char_type(U'A') == U'A'); #endif Index: test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp =================================================================== --- test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp +++ test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp @@ -16,10 +16,12 @@ #include #include +#include "test_macros.h" + int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 assert(std::char_traits::to_int_type(U'a') == U'a'); assert(std::char_traits::to_int_type(U'A') == U'A'); #endif Index: test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp =================================================================== --- test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp +++ test/std/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp @@ -21,6 +21,8 @@ #include #include +#include "test_macros.h" + typedef std::chrono::milliseconds ms; std::once_flag flg0; @@ -171,7 +173,7 @@ void operator()(int&) {} }; -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 // reference qualifiers on functions are a C++11 extension struct RefQual { @@ -240,7 +242,7 @@ int i = 0; std::call_once(f, NonCopyable(), i); } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 // reference qualifiers on functions are a C++11 extension { std::once_flag f1, f2; Index: test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp =================================================================== --- test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp +++ test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp @@ -11,7 +11,9 @@ #include #include -#if __cplusplus >= 201103L +#include "test_macros.h" + +#if TEST_STD_VER >= 11 // #include // // template Index: test/std/utilities/function.objects/func.memfn/member_function.pass.cpp =================================================================== --- test/std/utilities/function.objects/func.memfn/member_function.pass.cpp +++ test/std/utilities/function.objects/func.memfn/member_function.pass.cpp @@ -15,6 +15,8 @@ #include #include +#include "test_macros.h" + struct A { char test0() {return 'a';} @@ -69,7 +71,7 @@ test0(std::mem_fn(&A::test0)); test1(std::mem_fn(&A::test1)); test2(std::mem_fn(&A::test2)); -#if __has_feature(cxx_noexcept) +#if TEST_STD_VER >= 11 static_assert((noexcept(std::mem_fn(&A::test0))), ""); // LWG#2489 #endif } Index: test/std/utilities/function.objects/unord.hash/enum.pass.cpp =================================================================== --- test/std/utilities/function.objects/unord.hash/enum.pass.cpp +++ test/std/utilities/function.objects/unord.hash/enum.pass.cpp @@ -12,7 +12,9 @@ // make sure that we can hash enumeration values // Not very portable -#if __cplusplus >= 201402L +#include "test_macros.h" + +#if TEST_STD_VER >= 14 #include #include Index: test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp =================================================================== --- test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp +++ test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp @@ -21,6 +21,8 @@ #include #include +#include "test_macros.h" + template struct A { @@ -61,7 +63,7 @@ const B b = {}; assert(std::allocator_traits >::max_size(b) == 100); } -#if __cplusplus >= 201103 +#if TEST_STD_VER >= 11 { std::allocator a; static_assert(noexcept(std::allocator_traits>::max_size(a)) == true, ""); Index: test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp =================================================================== --- test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp +++ test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp @@ -10,7 +10,9 @@ #include #include -#if __cplusplus >= 201103L +#include "test_macros.h" + +#if TEST_STD_VER >= 11 // #include // // template Index: test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp =================================================================== --- test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp +++ test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp @@ -13,6 +13,8 @@ #include #include +#include "test_macros.h" + int A_constructed = 0; struct A @@ -29,7 +31,7 @@ int main() { -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 typedef std::aligned_storage<3*sizeof(A), std::alignment_of::value>::type Storage; Storage buffer; Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp @@ -23,12 +23,15 @@ // atomic_compare_exchange_strong(shared_ptr* p, shared_ptr* v, // shared_ptr w); +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p(new int(4)); std::shared_ptr v(new int(3)); @@ -49,5 +52,4 @@ assert(*v == 4); assert(*w == 2); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp @@ -24,12 +24,15 @@ // shared_ptr w, memory_order success, // memory_order failure); +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p(new int(4)); std::shared_ptr v(new int(3)); @@ -54,5 +57,4 @@ assert(*v == 4); assert(*w == 2); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp @@ -23,12 +23,15 @@ // atomic_compare_exchange_weak(shared_ptr* p, shared_ptr* v, // shared_ptr w); +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p(new int(4)); std::shared_ptr v(new int(3)); @@ -49,5 +52,4 @@ assert(*v == 4); assert(*w == 2); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp @@ -24,12 +24,15 @@ // shared_ptr w, memory_order success, // memory_order failure); +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p(new int(4)); std::shared_ptr v(new int(3)); @@ -54,5 +57,4 @@ assert(*v == 4); assert(*w == 2); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp @@ -22,12 +22,15 @@ // shared_ptr // atomic_exchange(shared_ptr* p, shared_ptr r) +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p(new int(4)); std::shared_ptr r(new int(3)); @@ -35,5 +38,4 @@ assert(*p == 3); assert(*r == 4); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp @@ -22,12 +22,15 @@ // shared_ptr // atomic_exchange_explicit(shared_ptr* p, shared_ptr r) +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p(new int(4)); std::shared_ptr r(new int(3)); @@ -35,5 +38,4 @@ assert(*p == 3); assert(*r == 4); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp @@ -17,15 +17,17 @@ // bool // atomic_is_lock_free(const shared_ptr* p); +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { const std::shared_ptr p(new int(3)); assert(std::atomic_is_lock_free(&p) == false); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp @@ -22,16 +22,18 @@ // shared_ptr // atomic_load(const shared_ptr* p) +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p(new int(3)); std::shared_ptr q = std::atomic_load(&p); assert(*q == *p); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp @@ -22,16 +22,18 @@ // shared_ptr // atomic_load_explicit(const shared_ptr* p, memory_order mo) +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { const std::shared_ptr p(new int(3)); std::shared_ptr q = std::atomic_load_explicit(&p, std::memory_order_relaxed); assert(*q == *p); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp @@ -22,17 +22,19 @@ // void // atomic_store(shared_ptr* p, shared_ptr r) +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p; std::shared_ptr r(new int(3)); std::atomic_store(&p, r); assert(*p == *r); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp @@ -22,17 +22,19 @@ // void // atomic_store_explicit(shared_ptr* p, shared_ptr r, memory_order mo) +// UNSUPPORTED: c++98, c++03 + #include #include +#include "test_macros.h" + int main() { -#if __has_feature(cxx_atomic) { std::shared_ptr p; std::shared_ptr r(new int(3)); std::atomic_store_explicit(&p, r, std::memory_order_seq_cst); assert(*p == *r); } -#endif } Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp @@ -65,7 +65,7 @@ assert(test_deleter::count == 0); assert(test_deleter::dealloc_count == 1); test_deleter::dealloc_count = 0; -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 // Test an allocator that returns class-type pointers { std::shared_ptr p(nullptr, test_deleter(1), min_allocator()); Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp @@ -68,7 +68,7 @@ assert(test_deleter::count == 0); assert(test_deleter::dealloc_count == 1); test_deleter::dealloc_count = 0; -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 // Test an allocator that returns class-type pointers { A* ptr = new A; Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp @@ -19,6 +19,8 @@ #include #include +#include "test_macros.h" + bool throw_next = false; void* operator new(std::size_t s) throw(std::bad_alloc) @@ -105,7 +107,7 @@ fn(std::unique_ptr(new int)); } -#if __cplusplus >= 201402L +#if TEST_STD_VER >= 14 // LWG 2415 { std::unique_ptr p(nullptr, assert_deleter); Index: test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp =================================================================== --- test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp +++ test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp @@ -112,7 +112,7 @@ assert(test_allocator::alloc_count == 0); test >(); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test >(); #endif } Index: test/std/utilities/meta/meta.hel/bool_constant.pass.cpp =================================================================== --- test/std/utilities/meta/meta.hel/bool_constant.pass.cpp +++ test/std/utilities/meta/meta.hel/bool_constant.pass.cpp @@ -14,9 +14,11 @@ #include #include +#include "test_macros.h" + int main() { -#if __cplusplus > 201402L +#if TEST_STD_VER > 14 typedef std::bool_constant _t; static_assert(_t::value, ""); static_assert((std::is_same<_t::value_type, bool>::value), ""); Index: test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp @@ -164,7 +164,7 @@ // Use alignof(std::max_align_t) below to find the max alignment instead of // hardcoding it, because it's different on different platforms. // (For example 8 on arm and 16 on x86.) -#if __cplusplus < 201103L +#if TEST_STD_VER < 11 #define alignof __alignof__ #endif { Index: test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp =================================================================== --- test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp +++ test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp @@ -14,6 +14,8 @@ #include #include +#include "test_macros.h" + enum E { V = INT_MIN }; enum F { W = UINT_MAX }; @@ -29,7 +31,7 @@ static_assert((std::is_same, unsigned>::value), ""); #endif -#if __has_feature(cxx_strong_enums) +#if TEST_STD_VER >= 11 enum G : char { }; static_assert((std::is_same::type, char>::value), @@ -37,5 +39,5 @@ #if _LIBCPP_STD_VER > 11 static_assert((std::is_same, char>::value), ""); #endif -#endif // __has_feature(cxx_strong_enums) +#endif // TEST_STD_VER >= 11 } Index: test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp +++ test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp @@ -21,7 +21,7 @@ { explicit A(int); A(int, double); -#if __has_feature(cxx_access_control_sfinae) +#if TEST_STD_VER >= 11 private: #endif A(char); @@ -91,7 +91,7 @@ test_is_constructible (); test_is_not_constructible (); -#if __has_feature(cxx_access_control_sfinae) +#if TEST_STD_VER >= 11 test_is_not_constructible (); #else test_is_constructible (); Index: test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp +++ test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp @@ -79,7 +79,7 @@ test_is_not_copy_assignable (); test_is_not_copy_assignable (); #endif -#if __has_feature(cxx_access_control_sfinae) +#if TEST_STD_VER >= 11 test_is_not_copy_assignable (); #endif test_is_not_copy_assignable (); Index: test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp +++ test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp @@ -89,7 +89,7 @@ test_is_not_copy_constructible(); test_is_not_copy_constructible(); test_is_not_copy_constructible(); -#if __has_feature(cxx_access_control_sfinae) +#if TEST_STD_VER >= 11 test_is_not_copy_constructible(); #endif } Index: test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp +++ test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp @@ -100,7 +100,7 @@ test_is_not_default_constructible(); test_is_not_default_constructible(); test_is_not_default_constructible(); -#if __has_feature(cxx_access_control_sfinae) +#if TEST_STD_VER >= 11 test_is_not_default_constructible(); #endif } Index: test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp +++ test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp @@ -65,7 +65,7 @@ virtual ~Abstract() = 0; }; -#if __has_feature(cxx_attributes) +#if TEST_STD_VER >= 11 class Final final { }; #else Index: test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp @@ -9,7 +9,9 @@ // This is for bugs 18853 and 19118 -#if __cplusplus >= 201103L +#include "test_macros.h" + +#if TEST_STD_VER >= 11 #include #include 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 @@ -21,7 +21,9 @@ #include #include -#if __cplusplus > 201103L +#include "test_macros.h" + +#if TEST_STD_VER > 11 struct Empty {}; Index: test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp =================================================================== --- test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp +++ test/std/utilities/utility/pairs/pair.astuple/get_const.pass.cpp @@ -18,6 +18,8 @@ #include #include +#include "test_macros.h" + int main() { { @@ -27,7 +29,7 @@ assert(std::get<1>(p) == 4); } -#if __cplusplus > 201103L +#if TEST_STD_VER > 11 { typedef std::pair P; constexpr P p1(3, 4); Index: test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp =================================================================== --- test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp +++ test/std/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp @@ -18,7 +18,9 @@ #include #include -#if __cplusplus > 201103L +#include "test_macros.h" + +#if TEST_STD_VER > 11 struct S { std::pair a; int k; @@ -41,7 +43,7 @@ assert(std::get<1>(p) == 6); } -#if __cplusplus > 201103L +#if TEST_STD_VER > 11 { static_assert(S().k == 1, ""); static_assert(std::get<1>(getP()) == 4, ""); Index: test/support/MoveOnly.h =================================================================== --- test/support/MoveOnly.h +++ test/support/MoveOnly.h @@ -10,6 +10,8 @@ #ifndef MOVEONLY_H #define MOVEONLY_H +#include "test_macros.h" + #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include Index: test/support/count_new.hpp =================================================================== --- test/support/count_new.hpp +++ test/support/count_new.hpp @@ -14,13 +14,11 @@ # include # include -#ifndef __has_feature -# define __has_feature(x) 0 -#endif +#include "test_macros.h" -#if __has_feature(address_sanitizer) \ - || __has_feature(memory_sanitizer) \ - || __has_feature(thread_sanitizer) +#if TEST_HAS_FEATURE(address_sanitizer) \ + || TEST_HAS_FEATURE(memory_sanitizer) \ + || TEST_HAS_FEATURE(thread_sanitizer) #define DISABLE_NEW_COUNT #endif Index: test/support/min_allocator.h =================================================================== --- test/support/min_allocator.h +++ test/support/min_allocator.h @@ -40,7 +40,7 @@ }; -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 #include @@ -286,6 +286,6 @@ friend bool operator!=(min_allocator x, min_allocator y) {return !(x == y);} }; -#endif // __cplusplus >= 201103L +#endif // TEST_STD_VER >= 11 #endif // MIN_ALLOCATOR_H Index: test/support/test_macros.h =================================================================== --- test/support/test_macros.h +++ test/support/test_macros.h @@ -35,6 +35,7 @@ #endif /* Make a nice name for the standard version */ +#ifndef TEST_STD_VER #if __cplusplus <= 199711L # define TEST_STD_VER 3 #elif __cplusplus <= 201103L @@ -44,6 +45,7 @@ #else # define TEST_STD_VER 99 // greater than current standard #endif +#endif /* Features that were introduced in C++14 */ #if TEST_STD_VER >= 14