From 02f6369a6b0a661ea1a1bcd965d6e62a854c95db Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sun, 18 Jan 2015 19:05:51 +0000 Subject: [PATCH] Cleaning up the test suite; remove some includes of non-standard file <__config> git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@226411 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/std/iterators/iterator.container/data.pass.cpp | 3 --- test/std/iterators/iterator.container/empty.pass.cpp | 3 --- test/std/iterators/iterator.container/size.pass.cpp | 3 --- test/std/iterators/iterator.range/begin-end.pass.cpp | 2 -- test/std/re/re.alg/re.alg.match/basic.fail.cpp | 4 +--- test/std/re/re.alg/re.alg.search/basic.fail.cpp | 4 +--- .../std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp | 4 +--- .../std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp | 4 +--- test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp | 4 +--- test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp | 4 +--- .../re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp | 4 +--- test/std/utilities/function.objects/unord.hash/enum.pass.cpp | 4 +--- 12 files changed, 8 insertions(+), 35 deletions(-) diff --git a/test/std/iterators/iterator.container/data.pass.cpp b/test/std/iterators/iterator.container/data.pass.cpp index 75ba9505c..3d1fa3335 100644 --- a/test/std/iterators/iterator.container/data.pass.cpp +++ b/test/std/iterators/iterator.container/data.pass.cpp @@ -17,9 +17,6 @@ int main () {} #else - -#include <__config> - #include #include #include diff --git a/test/std/iterators/iterator.container/empty.pass.cpp b/test/std/iterators/iterator.container/empty.pass.cpp index 196a0e33b..f26cb98e1 100644 --- a/test/std/iterators/iterator.container/empty.pass.cpp +++ b/test/std/iterators/iterator.container/empty.pass.cpp @@ -16,9 +16,6 @@ int main () {} #else - -#include <__config> - #include #include #include diff --git a/test/std/iterators/iterator.container/size.pass.cpp b/test/std/iterators/iterator.container/size.pass.cpp index f8da9bf50..705fb40e1 100644 --- a/test/std/iterators/iterator.container/size.pass.cpp +++ b/test/std/iterators/iterator.container/size.pass.cpp @@ -15,9 +15,6 @@ int main () {} #else - -#include <__config> - #include #include #include diff --git a/test/std/iterators/iterator.range/begin-end.pass.cpp b/test/std/iterators/iterator.range/begin-end.pass.cpp index abb6433e2..bd7e0aa90 100644 --- a/test/std/iterators/iterator.range/begin-end.pass.cpp +++ b/test/std/iterators/iterator.range/begin-end.pass.cpp @@ -15,8 +15,6 @@ // template reverse_iterator rbegin(initializer_list il); // template reverse_iterator rend(initializer_list il); -#include <__config> - #if __cplusplus >= 201103L #include #include diff --git a/test/std/re/re.alg/re.alg.match/basic.fail.cpp b/test/std/re/re.alg/re.alg.match/basic.fail.cpp index d3b922c07..82f8e3b7e 100644 --- a/test/std/re/re.alg/re.alg.match/basic.fail.cpp +++ b/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/test/std/re/re.alg/re.alg.search/basic.fail.cpp b/test/std/re/re.alg/re.alg.search/basic.fail.cpp index 692ee94d9..9ab6a21ad 100644 --- a/test/std/re/re.alg/re.alg.search/basic.fail.cpp +++ b/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/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp b/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp index 9c17287cd..208de0e43 100644 --- a/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp +++ b/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/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp b/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp index ed3c9feaa..6753b0ad5 100644 --- a/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp +++ b/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/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp b/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp index 13120f36e..e58183682 100644 --- a/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp +++ b/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/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp b/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp index dba11c275..d0a100a1a 100644 --- a/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp +++ b/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/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp b/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp index fd75a8b68..94d8f9667 100644 --- a/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp +++ b/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/test/std/utilities/function.objects/unord.hash/enum.pass.cpp b/test/std/utilities/function.objects/unord.hash/enum.pass.cpp index dca59c62b..bd92a4ac4 100644 --- a/test/std/utilities/function.objects/unord.hash/enum.pass.cpp +++ b/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 #include