summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/strings/basic.string/string.ops/string.accessors
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-06-14 21:31:42 +0000
committerEric Fiselier <eric@efcs.ca>2016-06-14 21:31:42 +0000
commitf2f2a6395fad5bd49a573fdf2b20072735d496f7 (patch)
tree9e17e483fe805be6d7940b2b653063df88815347 /libcxx/test/std/strings/basic.string/string.ops/string.accessors
parent23b6d6adc9dd38fe6c2cb433e163dc74b2cdc8e6 (diff)
downloadbcm5719-llvm-f2f2a6395fad5bd49a573fdf2b20072735d496f7.tar.gz
bcm5719-llvm-f2f2a6395fad5bd49a573fdf2b20072735d496f7.zip
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! llvm-svn: 272716
Diffstat (limited to 'libcxx/test/std/strings/basic.string/string.ops/string.accessors')
-rw-r--r--libcxx/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp2
-rw-r--r--libcxx/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
index 3bdb800bf73..d6695b0b34b 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
@@ -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(""));
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
index 6ba040d2635..e50c61fb162 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
@@ -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;
OpenPOWER on IntegriCloud