[libcxx-commits] [libcxx] b50f024 - [libc++] Fix .compile.fail.cpp tests that should have been marked as UNSUPPORTED in C++03/11
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Aug 25 06:00:59 PDT 2022
Author: Louis Dionne
Date: 2022-08-25T09:00:43-04:00
New Revision: b50f02490e4679fc1acb0c120a57123a3badaccf
URL: https://github.com/llvm/llvm-project/commit/b50f02490e4679fc1acb0c120a57123a3badaccf
DIFF: https://github.com/llvm/llvm-project/commit/b50f02490e4679fc1acb0c120a57123a3badaccf.diff
LOG: [libc++] Fix .compile.fail.cpp tests that should have been marked as UNSUPPORTED in C++03/11
Differential Revision: https://reviews.llvm.org/D132595
Added:
Modified:
libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/find1.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/find2.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/find3.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/lower_bound1.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/lower_bound2.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/lower_bound3.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/upper_bound1.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/upper_bound2.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/upper_bound3.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/find1.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/find2.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/find3.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.compile.fail.cpp
libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.compile.fail.cpp
Removed:
################################################################################
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 f2cfaf71517bf..41463d682926b 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
+
// <map>
// 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 228a582cf600e..2e27429c33c8c 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
+
// <map>
// 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 dd1be0c759c17..9f60b2d6e0d08 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
+
// <map>
// 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 ef5206cd5386e..826d510ad71ea 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
+
// <map>
// 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 6e3190eaaa127..50616cfe8b1c6 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
+
// <map>
// 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 3ce4f3d08628e..b4b58d33dedbb 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
+
// <map>
// 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 6bd1a95abc58c..358983d846eb6 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
+
// <map>
// 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 7af1c0eb8b252..130f2bcd5c696 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
+
// <map>
// 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 32164fd3a97bb..6340de32cd8e9 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
+
// <map>
// 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 efdc762e8b788..91ef0befab5b8 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
+
// <map>
// 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 362b223ffa062..7ab8094b098d7 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
+
// <map>
// 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 cc8bdf92af743..09f7ac4c88001 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
+
// <map>
// 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 <map>
#include <cassert>
#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 8ed0eed59dc45..92003b60e849a 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
+
// <map>
// 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 d08b6c0f04e05..e02ef4d054119 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
+
// <map>
// 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 df7cd22699321..24aa859054749 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
+
// <map>
// 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 4ee0694e8c4f7..46231adfdf7d1 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
+
// <map>
// 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<int, double, transparent_less_no_type> 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 83e2d35822a9f..f7324aa22adf3 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
+
// <map>
// 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<int, double, transparent_less_private> 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 09cbb4c288b38..acceaae9db645 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
+
// <map>
// 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<int, double, transparent_less_not_a_type> 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 d093618cb34e6..dff6e13c2ec8c 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
+
// <map>
// 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<int, double, transparent_less_no_type> 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 84958d3a8224a..a57c8404a5fc8 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
+
// <map>
// 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 6bf34c2e537cd..e215d0fe8b996 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
+
// <map>
// 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 a22d1b5a03771..162d334f27593 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
+
// <map>
// 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 cf2e4b4987b9f..fe3756e0bba36 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
+
// <map>
// 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 2be4062bb5d03..b5cce48928906 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
+
// <map>
// 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 0279f54bf440a..d8b34e012e0d2 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
+
// <map>
// 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 2282003f4d44d..303e17aad1bc0 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
+
// <map>
// 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 f5751647ac645..8eb96a99b43c4 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
+
// <map>
// 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 39ecc3cc4cf69..4d09bc5177691 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
+
// <map>
// 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 f51a199c1198e..6494ae3789fe4 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
+
// <map>
// 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 68d05710048f0..246ef0886dc35 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
+
// <map>
// 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 e2bebbaea10c8..f9afb1304ffe3 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
+
// <iterator>
// 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<S> it;
- }
-#else
-#error "C++11 only test"
-#endif
+ constexpr std::istream_iterator<S> it;
return 0;
}
More information about the libcxx-commits
mailing list