summaryrefslogtreecommitdiffstats
path: root/libcxx/test/strings/basic.string/string.nonmembers
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2010-09-04 23:28:19 +0000
committerHoward Hinnant <hhinnant@apple.com>2010-09-04 23:28:19 +0000
commit7609c9b665d67c9738fdd0af53ba9e8782218542 (patch)
tree79269b65cc775b7f08160aca8f688ba04e0bfe86 /libcxx/test/strings/basic.string/string.nonmembers
parentedbdff64c720d143b5ae7ace2733256b51be8bb9 (diff)
downloadbcm5719-llvm-7609c9b665d67c9738fdd0af53ba9e8782218542.tar.gz
bcm5719-llvm-7609c9b665d67c9738fdd0af53ba9e8782218542.zip
Changed __config to react to all of clang's currently documented has_feature flags, and renamed _LIBCPP_MOVE to _LIBCPP_HAS_NO_RVALUE_REFERENCES to be more consistent with the rest of the libc++'s flags, and with clang's nomenclature.
llvm-svn: 113086
Diffstat (limited to 'libcxx/test/strings/basic.string/string.nonmembers')
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp8
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp8
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp8
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp8
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp8
7 files changed, 24 insertions, 24 deletions
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
index 6cd704bdeb6..a7e0ad358f0 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
@@ -20,7 +20,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
std::string s("initial text");
getline(std::istringstream(" abc* def* ghij"), s, '*');
@@ -31,5 +31,5 @@ int main()
getline(std::wistringstream(L" abc* def* ghij"), s, L'*');
assert(s == L" abc");
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
index 2a999cbf27c..49187fb6f51 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
@@ -20,7 +20,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
std::string s("initial text");
getline(std::istringstream(" abc\n def\n ghij"), s);
@@ -31,5 +31,5 @@ int main()
getline(std::wistringstream(L" abc\n def\n ghij"), s);
assert(s == L" abc");
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
index cbf046c78c2..383331ef93c 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
@@ -27,7 +27,7 @@ test0(typename S::value_type lhs, const S& rhs, const S& x)
assert(lhs + rhs == x);
}
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class S>
void
@@ -36,7 +36,7 @@ test1(typename S::value_type lhs, S&& rhs, const S& x)
assert(lhs + move(rhs) == x);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
typedef std::string S;
@@ -47,12 +47,12 @@ int main()
test0('a', S("1234567890"), S("a1234567890"));
test0('a', S("12345678901234567890"), S("a12345678901234567890"));
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
test1('a', S(""), S("a"));
test1('a', S("12345"), S("a12345"));
test1('a', S("1234567890"), S("a1234567890"));
test1('a', S("12345678901234567890"), S("a12345678901234567890"));
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
index 9a8dcedff13..c9973a4f443 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
@@ -27,7 +27,7 @@ test0(const typename S::value_type* lhs, const S& rhs, const S& x)
assert(lhs + rhs == x);
}
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class S>
void
@@ -36,7 +36,7 @@ test1(const typename S::value_type* lhs, S&& rhs, const S& x)
assert(lhs + move(rhs) == x);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
typedef std::string S;
@@ -59,7 +59,7 @@ int main()
test0("abcdefghijklmnopqrst", S("1234567890"), S("abcdefghijklmnopqrst1234567890"));
test0("abcdefghijklmnopqrst", S("12345678901234567890"), S("abcdefghijklmnopqrst12345678901234567890"));
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
test1("", S(""), S(""));
test1("", S("12345"), S("12345"));
@@ -78,5 +78,5 @@ int main()
test1("abcdefghijklmnopqrst", S("1234567890"), S("abcdefghijklmnopqrst1234567890"));
test1("abcdefghijklmnopqrst", S("12345678901234567890"), S("abcdefghijklmnopqrst12345678901234567890"));
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
index b55252e680c..d6cd5fa2fd4 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
@@ -27,7 +27,7 @@ test0(const S& lhs, typename S::value_type rhs, const S& x)
assert(lhs + rhs == x);
}
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class S>
void
@@ -36,7 +36,7 @@ test1(S&& lhs, typename S::value_type rhs, const S& x)
assert(move(lhs) + rhs == x);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
typedef std::string S;
@@ -47,12 +47,12 @@ int main()
test0(S("abcdefghij"), '1', S("abcdefghij1"));
test0(S("abcdefghijklmnopqrst"), '1', S("abcdefghijklmnopqrst1"));
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
test1(S(""), '1', S("1"));
test1(S("abcde"), '1', S("abcde1"));
test1(S("abcdefghij"), '1', S("abcdefghij1"));
test1(S("abcdefghijklmnopqrst"), '1', S("abcdefghijklmnopqrst1"));
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
index afe67356c72..c3046d461ce 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
@@ -27,7 +27,7 @@ test0(const S& lhs, const typename S::value_type* rhs, const S& x)
assert(lhs + rhs == x);
}
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class S>
void
@@ -36,7 +36,7 @@ test1(S&& lhs, const typename S::value_type* rhs, const S& x)
assert(move(lhs) + rhs == x);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
typedef std::string S;
@@ -59,7 +59,7 @@ int main()
test0(S("abcdefghijklmnopqrst"), "1234567890", S("abcdefghijklmnopqrst1234567890"));
test0(S("abcdefghijklmnopqrst"), "12345678901234567890", S("abcdefghijklmnopqrst12345678901234567890"));
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
test1(S(""), "", S(""));
test1(S(""), "12345", S("12345"));
@@ -78,5 +78,5 @@ int main()
test1(S("abcdefghijklmnopqrst"), "1234567890", S("abcdefghijklmnopqrst1234567890"));
test1(S("abcdefghijklmnopqrst"), "12345678901234567890", S("abcdefghijklmnopqrst12345678901234567890"));
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
index ef11400c43e..aba731902a0 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
@@ -39,7 +39,7 @@ test0(const S& lhs, const S& rhs, const S& x)
assert(lhs + rhs == x);
}
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class S>
void
@@ -62,7 +62,7 @@ test3(S&& lhs, S&& rhs, const S& x)
assert(move(lhs) + move(rhs) == x);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
typedef std::string S;
@@ -85,7 +85,7 @@ int main()
test0(S("abcdefghijklmnopqrst"), S("1234567890"), S("abcdefghijklmnopqrst1234567890"));
test0(S("abcdefghijklmnopqrst"), S("12345678901234567890"), S("abcdefghijklmnopqrst12345678901234567890"));
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
test1(S(""), S(""), S(""));
test1(S(""), S("12345"), S("12345"));
@@ -138,5 +138,5 @@ int main()
test3(S("abcdefghijklmnopqrst"), S("1234567890"), S("abcdefghijklmnopqrst1234567890"));
test3(S("abcdefghijklmnopqrst"), S("12345678901234567890"), S("abcdefghijklmnopqrst12345678901234567890"));
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
OpenPOWER on IntegriCloud