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
This commit is contained in:
@@ -40,7 +40,7 @@ int main()
|
||||
test(S("abcdefghij"));
|
||||
test(S("abcdefghijklmnopqrst"));
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""));
|
||||
|
||||
@@ -34,7 +34,7 @@ int main()
|
||||
test(S("abcdefghij", A(2)), A(2));
|
||||
test(S("abcdefghijklmnopqrst", A(3)), A(3));
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef min_allocator<char> A;
|
||||
typedef std::basic_string<char, std::char_traits<char>, A> S;
|
||||
|
||||
@@ -53,7 +53,7 @@ int main()
|
||||
test(S("abcdefghijklmnopqrst"), "abcdefghij", 10);
|
||||
test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", 0);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), "", 0);
|
||||
|
||||
@@ -362,7 +362,7 @@ int main()
|
||||
test1<S>();
|
||||
test2<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -1304,7 +1304,7 @@ int main()
|
||||
test10<S>();
|
||||
test11<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -362,7 +362,7 @@ int main()
|
||||
test1<S>();
|
||||
test2<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -5885,7 +5885,7 @@ int main()
|
||||
test54<S>();
|
||||
test55<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -53,7 +53,7 @@ int main()
|
||||
test(S("abcdefghijklmnopqrst"), S("abcdefghij"), 10);
|
||||
test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), 0);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), S(""), 0);
|
||||
|
||||
@@ -67,7 +67,7 @@ int main()
|
||||
test(S("gfsmthlkon"), 'q', 0);
|
||||
test(S("laenfsbridchgotmkqpj"), 'q', 0);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), 'q', 0, S::npos);
|
||||
|
||||
@@ -148,7 +148,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -375,7 +375,7 @@ int main()
|
||||
test2<S>();
|
||||
test3<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -147,7 +147,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -65,7 +65,7 @@ int main()
|
||||
test(S("gfsmthlkon"), 'e', S::npos);
|
||||
test(S("laenfsbridchgotmkqpj"), 'e', 2);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), 'e', 0, S::npos);
|
||||
|
||||
@@ -148,7 +148,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -375,7 +375,7 @@ int main()
|
||||
test2<S>();
|
||||
test3<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -147,7 +147,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -65,7 +65,7 @@ int main()
|
||||
test(S("gfsmthlkon"), 'i', 9);
|
||||
test(S("laenfsbridchgotmkqpj"), 'i', 19);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), 'i', 0, S::npos);
|
||||
|
||||
@@ -148,7 +148,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -375,7 +375,7 @@ int main()
|
||||
test2<S>();
|
||||
test3<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -147,7 +147,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -65,7 +65,7 @@ int main()
|
||||
test(S("gfsmthlkon"), 'm', 3);
|
||||
test(S("laenfsbridchgotmkqpj"), 'm', 15);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), 'm', 0, S::npos);
|
||||
|
||||
@@ -148,7 +148,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -375,7 +375,7 @@ int main()
|
||||
test2<S>();
|
||||
test3<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -147,7 +147,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -65,7 +65,7 @@ int main()
|
||||
test(S("abcdeabcde"), 'c', 2);
|
||||
test(S("abcdeabcdeabcdeabcde"), 'c', 2);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), 'c', 0, S::npos);
|
||||
|
||||
@@ -154,7 +154,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -375,7 +375,7 @@ int main()
|
||||
test2<S>();
|
||||
test3<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -147,7 +147,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -65,7 +65,7 @@ int main()
|
||||
test(S("abcdeabcde"), 'b', 6);
|
||||
test(S("abcdeabcdeabcdeabcde"), 'b', 16);
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(""), 'b', 0, S::npos);
|
||||
|
||||
@@ -155,7 +155,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -375,7 +375,7 @@ int main()
|
||||
test2<S>();
|
||||
test3<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
@@ -147,7 +147,7 @@ int main()
|
||||
test0<S>();
|
||||
test1<S>();
|
||||
}
|
||||
#if __cplusplus >= 201103L
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test0<S>();
|
||||
|
||||
Reference in New Issue
Block a user