Replace __cplusplus comparisons and dialect __has_feature checks with TEST_STD_VER.

This is a huge cleanup that helps make the libc++ test suite more portable.
Patch from STL@microsoft.com. Thanks STL!


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@272716 91177308-0d34-0410-b5e6-96231b3b80d8

test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp

@@ -57,13 +57,13 @@ test()
     test<Iter>(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

test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp

@@ -75,14 +75,14 @@ void test_eq()
     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

test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp

@@ -57,13 +57,13 @@ test()
     test<Iter>(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

test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp

@@ -75,14 +75,14 @@ void test_eq()
     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

test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp

@@ -74,13 +74,13 @@ test()
     }
 }
 
-#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, "" );

test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp

@@ -79,14 +79,14 @@ test()
     }
 }
 
-#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, "" );

test/std/containers/associative/map/map.access/at.pass.cpp

@@ -86,7 +86,7 @@ int main()
         assert(m.at(8) == 8.5);
         assert(m.size() == 7);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<const int, double> V;
         V ar[] =

test/std/containers/associative/map/map.access/empty.pass.cpp

@@ -29,7 +29,7 @@ int main()
     m.clear();
     assert(m.empty());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     M m;

test/std/containers/associative/map/map.access/iterator.pass.cpp

@@ -119,7 +119,7 @@ int main()
             assert(i->second == 1);
         }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<const int, double> V;
         V ar[] =

test/std/containers/associative/map/map.access/max_size.pass.cpp

@@ -25,7 +25,7 @@ int main()
     M m;
     assert(m.max_size() != 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     M m;

test/std/containers/associative/map/map.access/size.pass.cpp

@@ -37,7 +37,7 @@ int main()
     m.erase(m.begin());
     assert(m.size() == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     M m;

test/std/containers/associative/map/map.cons/alloc.pass.cpp

@@ -29,7 +29,7 @@ int main()
     assert(m.begin() == m.end());
     assert(m.get_allocator() == A(5));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::less<int> C;
     typedef min_allocator<std::pair<const int, double> > A;

test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp

@@ -45,7 +45,7 @@ int main()
     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<const int, double> V;
     std::map<int, double, std::less<int>, min_allocator<V>> m =

test/std/containers/associative/map/map.cons/compare.pass.cpp

@@ -28,7 +28,7 @@ int main()
     assert(m.begin() == m.end());
     assert(m.key_comp() == C(3));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef test_compare<std::less<int> > C;
     std::map<int, double, C, min_allocator<std::pair<const int, double>>> m(C(3));

test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp

@@ -31,7 +31,7 @@ int main()
     assert(m.key_comp() == C(4));
     assert(m.get_allocator() == A(5));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef test_compare<std::less<int> > C;
     typedef min_allocator<std::pair<const int, double> > A;

test/std/containers/associative/map/map.cons/copy.pass.cpp

@@ -92,7 +92,7 @@ int main()
         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<const int, double> V;
         V ar[] =

test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp

@@ -56,7 +56,7 @@ int main()
     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<const int, double> V;
     V ar[] =

test/std/containers/associative/map/map.cons/copy_assign.pass.cpp

@@ -107,7 +107,7 @@ int main()
         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<const int, double> V;
         V ar[] =

test/std/containers/associative/map/map.cons/default.pass.cpp

@@ -25,7 +25,7 @@ int main()
     assert(m.empty());
     assert(m.begin() == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> m;
     assert(m.empty());

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 <map>
 #include <cassert>
 
@@ -33,7 +35,6 @@ struct some_comp
 
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::map<MoveOnly, MoveOnly> C;
@@ -51,5 +52,4 @@ int main()
         typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_default_constructible<C>::value, "");
     }
-#endif
 }

test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp

@@ -11,14 +11,14 @@
 
 // ~map() // implied noexcept;
 
+// UNSUPPORTED: c++98, c++03
+
 #include <map>
 #include <cassert>
 
 #include "MoveOnly.h"
 #include "test_allocator.h"
 
-#if __has_feature(cxx_noexcept)
-
 template <class T>
 struct some_comp
 {
@@ -27,11 +27,8 @@ struct some_comp
     bool operator()(const T&, const T&) const noexcept { return false; }
 };
 
-#endif
-
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::map<MoveOnly, MoveOnly> C;
@@ -49,5 +46,4 @@ int main()
         typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_destructible<C>::value, "");
     }
-#endif
 }

test/std/containers/associative/map/map.cons/initializer_list.pass.cpp

@@ -41,7 +41,7 @@ int main()
     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<const int, double> V;
     std::map<int, double, std::less<int>, min_allocator<V>> m =

test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp

@@ -42,7 +42,7 @@ int main()
     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<const int, double> V;
     typedef test_compare<std::less<int> > C;

test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp

@@ -45,7 +45,7 @@ int main()
     assert(m.key_comp() == C(3));
     assert(m.get_allocator() == A(6));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::pair<const int, double> V;
     typedef test_compare<std::less<int> > C;

test/std/containers/associative/map/map.cons/iter_iter.pass.cpp

@@ -42,7 +42,7 @@ int main()
     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<const int, double> V;
     V ar[] =

test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp

@@ -45,7 +45,7 @@ int main()
     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<const int, double> V;
     V ar[] =

test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp

@@ -49,7 +49,7 @@ int main()
     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<const int, double> V;
     V ar[] =

test/std/containers/associative/map/map.cons/move.pass.cpp

@@ -69,7 +69,7 @@ int main()
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef test_compare<std::less<int> > C;
         typedef min_allocator<V> A;

test/std/containers/associative/map/map.cons/move_alloc.pass.cpp

@@ -189,7 +189,7 @@ int main()
         }
         assert(Counter_base::gConstructed == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<MoveOnly, MoveOnly> V;
         typedef std::pair<const MoveOnly, MoveOnly> VC;

test/std/containers/associative/map/map.cons/move_assign.pass.cpp

@@ -144,7 +144,7 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<MoveOnly, MoveOnly> V;
         typedef std::pair<const MoveOnly, MoveOnly> VC;

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 <map>
 #include <cassert>
 
@@ -33,7 +35,6 @@ struct some_comp
 
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::map<MoveOnly, MoveOnly> C;
@@ -51,5 +52,4 @@ int main()
         typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_move_assignable<C>::value, "");
     }
-#endif
 }

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 <map>
 #include <cassert>
 
@@ -31,7 +33,6 @@ struct some_comp
 
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::map<MoveOnly, MoveOnly> C;
@@ -49,5 +50,4 @@ int main()
         typedef std::map<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_move_constructible<C>::value, "");
     }
-#endif
 }

test/std/containers/associative/map/map.modifiers/clear.pass.cpp

@@ -39,7 +39,7 @@ int main()
         m.clear();
         assert(m.size() == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/map/map.modifiers/emplace.pass.cpp

@@ -92,7 +92,7 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::map<int, DefaultOnly, std::less<int>, min_allocator<std::pair<const int, DefaultOnly>>> M;
         typedef std::pair<M::iterator, bool> R;

test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp

@@ -89,7 +89,7 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::map<int, DefaultOnly, std::less<int>, min_allocator<std::pair<const int, DefaultOnly>>> M;
         typedef M::iterator R;

test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp

@@ -134,7 +134,7 @@ int main()
         assert(i == m.begin());
         assert(i == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;
@@ -242,7 +242,7 @@ int main()
         assert(i == m.end());
     }
 #endif
-#if __cplusplus >= 201402L
+#if TEST_STD_VER >= 14
     {
     //  This is LWG #2059
         typedef TemplateConstructor T;

test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp

@@ -86,7 +86,7 @@ int main()
         assert(i == m.begin());
         assert(i == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp

@@ -145,7 +145,7 @@ int main()
         assert(m.size() == 0);
         assert(s == 1);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp

@@ -43,7 +43,7 @@ int main()
     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<const int, double> V;
     std::map<int, double, std::less<int>, min_allocator<V>> m =

test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp

@@ -47,7 +47,7 @@ int main()
         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<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/map/map.ops/count.pass.cpp

@@ -59,7 +59,7 @@ int main()
         assert(r == 0);
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::pair<const int, double> V;
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;

test/std/containers/associative/map/map.ops/equal_range.pass.cpp

@@ -159,7 +159,7 @@ int main()
         assert(r.second == next(m.begin(), 8));
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::pair<const int, double> V;
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;

test/std/containers/associative/map/map.ops/find.pass.cpp

@@ -93,7 +93,7 @@ int main()
         assert(r == next(m.begin(), 8));
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::pair<const int, double> V;
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;

test/std/containers/associative/map/map.ops/lower_bound.pass.cpp

@@ -125,7 +125,7 @@ int main()
         assert(r == next(m.begin(), 8));
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::pair<const int, double> V;
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;

test/std/containers/associative/map/map.ops/upper_bound.pass.cpp

@@ -124,7 +124,7 @@ int main()
         assert(r == next(m.begin(), 8));
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::pair<const int, double> V;
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;

test/std/containers/associative/map/map.special/member_swap.pass.cpp

@@ -96,7 +96,7 @@ int main()
         assert(m2 == m1_save);
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
     {

test/std/containers/associative/map/map.special/non_member_swap.pass.cpp

@@ -167,7 +167,7 @@ int main()
         assert(m2.key_comp() == C(1));
         assert(m2.get_allocator() == A(1));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::map<int, double, std::less<int>, min_allocator<V>> M;
     {

test/std/containers/associative/map/types.pass.cpp

@@ -50,7 +50,7 @@ int main()
     static_assert((std::is_same<C::size_type, std::size_t>::value), "");
     static_assert((std::is_same<C::difference_type, std::ptrdiff_t>::value), "");
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> C;
     static_assert((std::is_same<C::key_type, int>::value), "");

test/std/containers/associative/multimap/empty.pass.cpp

@@ -29,7 +29,7 @@ int main()
     m.clear();
     assert(m.empty());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     M m;

test/std/containers/associative/multimap/iterator.pass.cpp

@@ -121,7 +121,7 @@ int main()
                 assert(i->second == d);
             }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<const int, double> V;
         V ar[] =

test/std/containers/associative/multimap/max_size.pass.cpp

@@ -25,7 +25,7 @@ int main()
     M m;
     assert(m.max_size() != 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     M m;

test/std/containers/associative/multimap/multimap.cons/alloc.pass.cpp

@@ -29,7 +29,7 @@ int main()
     assert(m.begin() == m.end());
     assert(m.get_allocator() == A(5));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::less<int> C;
     typedef min_allocator<std::pair<const int, double> > A;

test/std/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp

@@ -50,7 +50,7 @@ int main()
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> C;
     typedef C::value_type V;

test/std/containers/associative/multimap/multimap.cons/compare.pass.cpp

@@ -28,7 +28,7 @@ int main()
     assert(m.begin() == m.end());
     assert(m.key_comp() == C(3));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef test_compare<std::less<int> > C;
     std::multimap<int, double, C, min_allocator<std::pair<const int, double>>> m(C(3));

test/std/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp

@@ -31,7 +31,7 @@ int main()
     assert(m.key_comp() == C(4));
     assert(m.get_allocator() == A(5));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef test_compare<std::less<int> > C;
     typedef min_allocator<std::pair<const int, double> > A;

test/std/containers/associative/multimap/multimap.cons/copy.pass.cpp

@@ -74,7 +74,7 @@ int main()
         assert(mo.key_comp() == C(5));
     }
 #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<const int, double> V;
         V ar[] =

test/std/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp

@@ -47,7 +47,7 @@ int main()
     assert(mo.get_allocator() == A(7));
     assert(mo.key_comp() == C(5));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::pair<const int, double> V;
     V ar[] =

test/std/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp

@@ -94,7 +94,7 @@ int main()
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<const int, double> V;
         V ar[] =

test/std/containers/associative/multimap/multimap.cons/default.pass.cpp

@@ -25,7 +25,7 @@ int main()
     assert(m.empty());
     assert(m.begin() == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> m;
     assert(m.empty());

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 <map>
 #include <cassert>
 
@@ -33,7 +35,6 @@ struct some_comp
 
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::multimap<MoveOnly, MoveOnly> C;
@@ -51,5 +52,4 @@ int main()
         typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_default_constructible<C>::value, "");
     }
-#endif
 }

test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp

@@ -11,14 +11,14 @@
 
 // ~multimap() // implied noexcept;
 
+// UNSUPPORTED: c++98, c++03
+
 #include <map>
 #include <cassert>
 
 #include "MoveOnly.h"
 #include "test_allocator.h"
 
-#if __has_feature(cxx_noexcept)
-
 template <class T>
 struct some_comp
 {
@@ -27,11 +27,8 @@ struct some_comp
     bool operator()(const T&, const T&) const { return false; }
 };
 
-#endif
-
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::multimap<MoveOnly, MoveOnly> C;
@@ -49,5 +46,4 @@ int main()
         typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_destructible<C>::value, "");
     }
-#endif
 }

test/std/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp

@@ -49,7 +49,7 @@ int main()
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> C;
     typedef C::value_type V;

test/std/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp

@@ -53,7 +53,7 @@ int main()
     assert(*++i == V(3, 2));
     assert(m.key_comp() == Cmp(4));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef test_compare<std::less<int> > Cmp;
     typedef std::multimap<int, double, Cmp, min_allocator<std::pair<const int, double>>> C;

test/std/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp

@@ -57,7 +57,7 @@ int main()
     assert(m.get_allocator() == A(5));
     }
 #endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef test_compare<std::less<int> > Cmp;
     typedef min_allocator<std::pair<const int, double> > A;

test/std/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp

@@ -48,7 +48,7 @@ int main()
     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<const int, double> V;
     V ar[] =

test/std/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp

@@ -52,7 +52,7 @@ int main()
     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<const int, double> V;
     V ar[] =

test/std/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp

@@ -55,7 +55,7 @@ int main()
     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<const int, double> V;
     V ar[] =

test/std/containers/associative/multimap/multimap.cons/move.pass.cpp

@@ -75,7 +75,7 @@ int main()
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef test_compare<std::less<int> > C;
         typedef min_allocator<V> A;

test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp

@@ -189,7 +189,7 @@ int main()
         }
         assert(Counter_base::gConstructed == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<MoveOnly, MoveOnly> V;
         typedef std::pair<const MoveOnly, MoveOnly> VC;

test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp

@@ -144,7 +144,7 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::pair<MoveOnly, MoveOnly> V;
         typedef std::pair<const MoveOnly, MoveOnly> VC;

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 <map>
 #include <cassert>
 
@@ -33,7 +35,6 @@ struct some_comp
 
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::multimap<MoveOnly, MoveOnly> C;
@@ -51,5 +52,4 @@ int main()
         typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_move_assignable<C>::value, "");
     }
-#endif
 }

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 <map>
 #include <cassert>
 
@@ -31,7 +33,6 @@ struct some_comp
 
 int main()
 {
-#if __has_feature(cxx_noexcept)
     typedef std::pair<const MoveOnly, MoveOnly> V;
     {
         typedef std::multimap<MoveOnly, MoveOnly> C;
@@ -49,5 +50,4 @@ int main()
         typedef std::multimap<MoveOnly, MoveOnly, some_comp<MoveOnly>> C;
         static_assert(!std::is_nothrow_move_constructible<C>::value, "");
     }
-#endif
 }

test/std/containers/associative/multimap/multimap.modifiers/clear.pass.cpp

@@ -39,7 +39,7 @@ int main()
         m.clear();
         assert(m.size() == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp

@@ -84,7 +84,7 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multimap<int, DefaultOnly, std::less<int>, min_allocator<std::pair<const int, DefaultOnly>>> M;
         typedef M::iterator R;

test/std/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp

@@ -89,7 +89,7 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multimap<int, DefaultOnly, std::less<int>, min_allocator<std::pair<const int, DefaultOnly>>> M;
         typedef M::iterator R;

test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp

@@ -155,7 +155,7 @@ int main()
         assert(i == m.begin());
         assert(i == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;
@@ -284,7 +284,7 @@ int main()
         assert(i == m.end());
     }
 #endif
-#if __cplusplus >= 201402L
+#if TEST_STD_VER >= 14
     {
     //  This is LWG #2059
         typedef TemplateConstructor T;

test/std/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp

@@ -86,7 +86,7 @@ int main()
         assert(i == m.begin());
         assert(i == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp

@@ -84,7 +84,7 @@ int main()
         assert(m.size() == 0);
         assert(i == 3);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp

@@ -53,7 +53,7 @@ int main()
     assert(*++i == V(3, 2));
     assert(*++i == V(3, 1.5));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> C;
     typedef C::value_type V;

test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp

@@ -59,7 +59,7 @@ int main()
         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<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
         typedef std::pair<int, double> P;

test/std/containers/associative/multimap/multimap.ops/count.pass.cpp

@@ -56,7 +56,7 @@ int main()
         assert(r == 0);
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {

test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp

@@ -101,7 +101,7 @@ int main()
         assert(r.second == m.end());
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {

test/std/containers/associative/multimap/multimap.ops/find.pass.cpp

@@ -83,7 +83,7 @@ int main()
         assert(r == m.end());
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {

test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp

@@ -87,7 +87,7 @@ int main()
         assert(r == m.end());
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {

test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp

@@ -87,7 +87,7 @@ int main()
         assert(r == m.end());
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {

test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp

@@ -96,7 +96,7 @@ int main()
         assert(m2 == m1_save);
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {

test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp

@@ -167,7 +167,7 @@ int main()
         assert(m2.key_comp() == C(1));
         assert(m2.get_allocator() == A(1));
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {

test/std/containers/associative/multimap/size.pass.cpp

@@ -37,7 +37,7 @@ int main()
     m.erase(m.begin());
     assert(m.size() == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     M m;

test/std/containers/associative/multimap/types.pass.cpp

@@ -50,7 +50,7 @@ int main()
     static_assert((std::is_same<C::size_type, std::size_t>::value), "");
     static_assert((std::is_same<C::difference_type, std::ptrdiff_t>::value), "");
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> C;
     static_assert((std::is_same<C::key_type, int>::value), "");

test/std/containers/associative/multiset/clear.pass.cpp

@@ -39,7 +39,7 @@ int main()
         m.clear();
         assert(m.size() == 0);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
         typedef int V;

test/std/containers/associative/multiset/count.pass.cpp

@@ -55,7 +55,7 @@ int main()
         assert(r == 0);
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef int V;
     typedef std::multiset<int, std::less<int>, min_allocator<int>> M;

test/std/containers/associative/multiset/emplace.pass.cpp

@@ -68,7 +68,7 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
         typedef M::iterator R;

test/std/containers/associative/multiset/emplace_hint.pass.cpp

@@ -68,7 +68,7 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
         typedef M::iterator R;

test/std/containers/associative/multiset/empty.pass.cpp

@@ -29,7 +29,7 @@ int main()
     m.clear();
     assert(m.empty());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
     M m;

test/std/containers/associative/multiset/equal_range.pass.cpp

@@ -100,7 +100,7 @@ int main()
         assert(r.second == next(m.begin(), 9));
     }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     typedef int V;
     typedef std::multiset<int, std::less<int>, min_allocator<int>> M;

test/std/containers/associative/multiset/erase_iter.pass.cpp

@@ -106,7 +106,7 @@ int main()
         assert(i == m.begin());
         assert(i == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
         typedef int V;
@@ -186,7 +186,7 @@ int main()
         assert(i == m.end());
     }
 #endif
-#if __cplusplus >= 201402L
+#if TEST_STD_VER >= 14
     {
     //  This is LWG #2059
         typedef TemplateConstructor T;

test/std/containers/associative/multiset/erase_iter_iter.pass.cpp

@@ -78,7 +78,7 @@ int main()
         assert(m.size() == 0);
         assert(i == m.end());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
         typedef int V;

test/std/containers/associative/multiset/erase_key.pass.cpp

@@ -72,7 +72,7 @@ int main()
         assert(m.size() == 0);
         assert(i == 3);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
         typedef int V;

test/std/containers/associative/multiset/find.pass.cpp

@@ -92,7 +92,7 @@ int main()
             assert(r == next(m.begin(), 8));
         }
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef int V;
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;

test/std/containers/associative/multiset/insert_cv.pass.cpp

@@ -44,7 +44,7 @@ int main()
         assert(m.size() == 4);
         assert(*r == 3);
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
         typedef std::multiset<int, std::less<int>, min_allocator<int>> M;
         typedef M::iterator R;