Cleaning up the test suite; remove some includes of non-standard file <__config>

llvm-svn: 226411

diff --git a/libcxx/test/std/iterators/iterator.container/data.pass.cpp b/libcxx/test/std/iterators/iterator.container/data.pass.cpp
index 75ba950..3d1fa33 100644 (file)
--- a/libcxx/test/std/iterators/iterator.container/data.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.container/data.pass.cpp
@@ -17,9 +17,6 @@
 int main () {}
 #else
 
-
-#include <__config>
-
 #include <iterator>
 #include <cassert>
 #include <vector>

diff --git a/libcxx/test/std/iterators/iterator.container/empty.pass.cpp b/libcxx/test/std/iterators/iterator.container/empty.pass.cpp
index 196a0e3..f26cb98 100644 (file)
--- a/libcxx/test/std/iterators/iterator.container/empty.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.container/empty.pass.cpp
@@ -16,9 +16,6 @@
 int main () {}
 #else
 
-
-#include <__config>
-
 #include <iterator>
 #include <cassert>
 #include <vector>

diff --git a/libcxx/test/std/iterators/iterator.container/size.pass.cpp b/libcxx/test/std/iterators/iterator.container/size.pass.cpp
index f8da9bf..705fb40 100644 (file)
--- a/libcxx/test/std/iterators/iterator.container/size.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.container/size.pass.cpp
@@ -15,9 +15,6 @@
 int main () {}
 #else
 
-
-#include <__config>
-
 #include <iterator>
 #include <cassert>
 #include <vector>

diff --git a/libcxx/test/std/iterators/iterator.range/begin-end.pass.cpp b/libcxx/test/std/iterators/iterator.range/begin-end.pass.cpp
index abb6433..bd7e0aa 100644 (file)
--- a/libcxx/test/std/iterators/iterator.range/begin-end.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.range/begin-end.pass.cpp
@@ -15,8 +15,6 @@
 // template <class E> reverse_iterator<const E*> rbegin(initializer_list<E> il);
 // template <class E> reverse_iterator<const E*> rend(initializer_list<E> il);
 
-#include <__config>
-
 #if __cplusplus >= 201103L
 #include <iterator>
 #include <cassert>

diff --git a/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp b/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp
index d3b922c..82f8e3b 100644 (file)
--- a/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp
@@ -18,9 +18,7 @@
 //                    regex_constants::match_flag_type = 
 //                      regex_constants::match_default) = delete;
 
-#include <__config>
-
-#if _LIBCPP_STD_VER <= 11
+#if __cplusplus <= 201402L
 #error
 #else
 

diff --git a/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp b/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp
index 692ee94..9ab6a21 100644 (file)
--- a/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp
@@ -18,9 +18,7 @@
 //                     regex_constants::match_flag_type = 
 //                       regex_constants::match_default) = delete;
 
-#include <__config>
-
-#if _LIBCPP_STD_VER <= 11
+#if __cplusplus <= 201402L
 #error
 #else
 

diff --git a/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp b/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp
index 9c17287..208de0e 100644 (file)
--- a/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp
@@ -17,9 +17,7 @@
 //                      regex_constants::match_flag_type m =
 //                        regex_constants::match_default) = delete;
 
-#include <__config>
-
-#if _LIBCPP_STD_VER <= 11
+#if __cplusplus <= 201402L
 #error
 #else
 

diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp
index ed3c9fe..6753b0a 100644 (file)
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp
@@ -18,9 +18,7 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#include <__config>
-
-#if _LIBCPP_STD_VER <= 11
+#if __cplusplus <= 201402L
 #error
 #else
 

diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp
index 13120f3..e581836 100644 (file)
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp
@@ -17,9 +17,7 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#include <__config>
-
-#if _LIBCPP_STD_VER <= 11
+#if __cplusplus <= 201402L
 #error
 #else
 

diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp
index dba11c2..d0a100a 100644 (file)
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp
@@ -16,9 +16,7 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#include <__config>
-
-#if _LIBCPP_STD_VER <= 11
+#if __cplusplus <= 201402L
 #error
 #else
 

diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp
index fd75a8b..94d8f96 100644 (file)
--- a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp
+++ b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp
@@ -18,9 +18,7 @@
 //                      regex_constants::match_flag_type m =
 //                                              regex_constants::match_default);
 
-#include <__config>
-
-#if _LIBCPP_STD_VER <= 11
+#if __cplusplus <= 201402L
 #error
 #else
 

diff --git a/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp b/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
index dca59c6..bd92a4a 100644 (file)
--- a/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
@@ -12,9 +12,7 @@
 // make sure that we can hash enumeration values
 // Not very portable
 
-#include <__config>
-
-#if _LIBCPP_STD_VER > 11
+#if __cplusplus >= 201402L
 
 #include <functional>
 #include <cassert>