From b50f02490e4679fc1acb0c120a57123a3badaccf Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 24 Aug 2022 15:39:07 -0400 Subject: [PATCH] [libc++] Fix .compile.fail.cpp tests that should have been marked as UNSUPPORTED in C++03/11 Differential Revision: https://reviews.llvm.org/D132595 --- .../containers/associative/map/map.ops/count1.compile.fail.cpp | 7 ++----- .../containers/associative/map/map.ops/count2.compile.fail.cpp | 7 ++----- .../containers/associative/map/map.ops/count3.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/equal_range1.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/equal_range2.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/equal_range3.compile.fail.cpp | 7 ++----- .../containers/associative/map/map.ops/find1.compile.fail.cpp | 7 ++----- .../containers/associative/map/map.ops/find2.compile.fail.cpp | 7 ++----- .../containers/associative/map/map.ops/find3.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/lower_bound1.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/lower_bound2.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/lower_bound3.compile.fail.cpp | 8 ++------ .../associative/map/map.ops/upper_bound1.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/upper_bound2.compile.fail.cpp | 7 ++----- .../associative/map/map.ops/upper_bound3.compile.fail.cpp | 7 ++----- .../associative/multimap/multimap.ops/count1.compile.fail.cpp | 7 ++----- .../associative/multimap/multimap.ops/count2.compile.fail.cpp | 7 ++----- .../associative/multimap/multimap.ops/count3.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/equal_range1.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/equal_range2.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/equal_range3.compile.fail.cpp | 7 ++----- .../associative/multimap/multimap.ops/find1.compile.fail.cpp | 7 ++----- .../associative/multimap/multimap.ops/find2.compile.fail.cpp | 7 ++----- .../associative/multimap/multimap.ops/find3.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/lower_bound1.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/lower_bound2.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/lower_bound3.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/upper_bound1.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/upper_bound2.compile.fail.cpp | 7 ++----- .../multimap/multimap.ops/upper_bound3.compile.fail.cpp | 7 ++----- .../istream.iterator.cons/default.compile.fail.cpp | 10 +++------- 31 files changed, 63 insertions(+), 158 deletions(-) diff --git a/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp index f2cfaf7..41463d6 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -23,10 +25,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -35,4 +33,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().count(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp index 228a582..2e27429 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -23,10 +25,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -35,4 +33,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().count(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp index dd1be0c..9f60b2d 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -23,10 +25,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -35,4 +33,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().count(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp index ef5206c..826d510 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().equal_range(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp index 6e3190e..50616cf 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().equal_range(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp index 3ce4f3d..b4b58d3 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().equal_range(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/find1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find1.compile.fail.cpp index 6bd1a95..358983d 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/find1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/find1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().find(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/find2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find2.compile.fail.cpp index 7af1c0e..130f2bc 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/find2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/find2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().find(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/find3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find3.compile.fail.cpp index 32164fd..6340de3 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/find3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/find3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().find(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.compile.fail.cpp index efdc762..91ef0be 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().lower_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.compile.fail.cpp index 362b223..7ab8094 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().lower_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.compile.fail.cpp index cc8bdf9..09f7ac4 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -17,17 +19,12 @@ // equal_range shall not participate in overload resolution unless the // qualified-id Compare::is_transparent is valid and denotes a type - #include #include #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +33,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().lower_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.compile.fail.cpp index 8ed0eed..92003b6 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().upper_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.compile.fail.cpp index d08b6c0..e02ef4d 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().upper_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.compile.fail.cpp index df7cd22..24aa859 100644 --- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().upper_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp index 4ee0694..46231ad 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -23,14 +25,9 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { typedef std::multimap M; TEST_IGNORE_NODISCARD M().count(C2Int{5}); } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp index 83e2d35..f7324aa 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -23,14 +25,9 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { typedef std::multimap M; TEST_IGNORE_NODISCARD M().count(C2Int{5}); } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp index 09cbb4c..acceaae 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -23,14 +25,9 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { typedef std::multimap M; TEST_IGNORE_NODISCARD M().count(C2Int{5}); } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp index d093618..dff6e13 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,14 +26,9 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { typedef std::multimap M; TEST_IGNORE_NODISCARD M().equal_range(C2Int{5}); } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp index 84958d3..a57c840 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().equal_range(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp index 6bf34c2..e215d0f 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().equal_range(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.compile.fail.cpp index a22d1b5..162d334 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().find(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.compile.fail.cpp index cf2e4b4..fe3756e 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class map @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().find(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.compile.fail.cpp index 2be4062..b5cce48 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().find(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.compile.fail.cpp index 0279f54..d8b34e0 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().lower_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.compile.fail.cpp index 2282003..303e17a 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().lower_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.compile.fail.cpp index f575164..8eb96a9 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().lower_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.compile.fail.cpp index 39ecc3c..4d09bc5 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().upper_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.compile.fail.cpp index f51a199..6494ae3 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().upper_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.compile.fail.cpp index 68d0571..246ef08 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.compile.fail.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03, c++11 + // // class multimap @@ -24,10 +26,6 @@ #include "test_macros.h" #include "is_transparent.h" -#if TEST_STD_VER <= 11 -#error "This test requires is C++14 (or later)" -#else - int main(int, char**) { { @@ -36,4 +34,3 @@ int main(int, char**) TEST_IGNORE_NODISCARD M().upper_bound(C2Int{5}); } } -#endif diff --git a/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.compile.fail.cpp b/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.compile.fail.cpp index e2bebba..f9afb13 100644 --- a/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.compile.fail.cpp +++ b/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.compile.fail.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++03 + // // class istream_iterator @@ -21,13 +23,7 @@ struct S { S(); }; // not constexpr int main(int, char**) { -#if TEST_STD_VER >= 11 - { - constexpr std::istream_iterator it; - } -#else -#error "C++11 only test" -#endif + constexpr std::istream_iterator it; return 0; } -- 2.7.4