vendor/libc++/libc++-trunk-r300890

1 files changed, 43 insertions, 41 deletions

diff --git a/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp b/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
index 3b669e7d9869..a9aa92f37e4e 100644
--- a/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
+++ b/test/std/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
@@ -21,29 +21,23 @@
 #include <utility>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
-void
-test0(const S& lhs, const typename S::value_type* rhs, const S& x)
-{
-    assert(lhs + rhs == x);
+void test0(const S& lhs, const typename S::value_type* rhs, const S& x) {
+  assert(lhs + rhs == x);
 }
 
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
+#if TEST_STD_VER >= 11
 template <class S>
-void
-test1(S&& lhs, const typename S::value_type* rhs, const S& x)
-{
-    assert(move(lhs) + rhs == x);
+void test1(S&& lhs, const typename S::value_type* rhs, const S& x) {
+  assert(move(lhs) + rhs == x);
 }
+#endif
 
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-int main()
-{
-    {
+int main() {
+  {
     typedef std::string S;
     test0(S(""), "", S(""));
     test0(S(""), "12345", S("12345"));
@@ -56,14 +50,18 @@ int main()
     test0(S("abcdefghij"), "", S("abcdefghij"));
     test0(S("abcdefghij"), "12345", S("abcdefghij12345"));
     test0(S("abcdefghij"), "1234567890", S("abcdefghij1234567890"));
-    test0(S("abcdefghij"), "12345678901234567890", S("abcdefghij12345678901234567890"));
+    test0(S("abcdefghij"), "12345678901234567890",
+          S("abcdefghij12345678901234567890"));
     test0(S("abcdefghijklmnopqrst"), "", S("abcdefghijklmnopqrst"));
     test0(S("abcdefghijklmnopqrst"), "12345", S("abcdefghijklmnopqrst12345"));
-    test0(S("abcdefghijklmnopqrst"), "1234567890", S("abcdefghijklmnopqrst1234567890"));
-    test0(S("abcdefghijklmnopqrst"), "12345678901234567890", S("abcdefghijklmnopqrst12345678901234567890"));
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
+    test0(S("abcdefghijklmnopqrst"), "1234567890",
+          S("abcdefghijklmnopqrst1234567890"));
+    test0(S("abcdefghijklmnopqrst"), "12345678901234567890",
+          S("abcdefghijklmnopqrst12345678901234567890"));
+  }
+#if TEST_STD_VER >= 11
+  {
+    typedef std::string S;
     test1(S(""), "", S(""));
     test1(S(""), "12345", S("12345"));
     test1(S(""), "1234567890", S("1234567890"));
@@ -75,17 +73,19 @@ int main()
     test1(S("abcdefghij"), "", S("abcdefghij"));
     test1(S("abcdefghij"), "12345", S("abcdefghij12345"));
     test1(S("abcdefghij"), "1234567890", S("abcdefghij1234567890"));
-    test1(S("abcdefghij"), "12345678901234567890", S("abcdefghij12345678901234567890"));
+    test1(S("abcdefghij"), "12345678901234567890",
+          S("abcdefghij12345678901234567890"));
     test1(S("abcdefghijklmnopqrst"), "", S("abcdefghijklmnopqrst"));
     test1(S("abcdefghijklmnopqrst"), "12345", S("abcdefghijklmnopqrst12345"));
-    test1(S("abcdefghijklmnopqrst"), "1234567890", S("abcdefghijklmnopqrst1234567890"));
-    test1(S("abcdefghijklmnopqrst"), "12345678901234567890", S("abcdefghijklmnopqrst12345678901234567890"));
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
+    test1(S("abcdefghijklmnopqrst"), "1234567890",
+          S("abcdefghijklmnopqrst1234567890"));
+    test1(S("abcdefghijklmnopqrst"), "12345678901234567890",
+          S("abcdefghijklmnopqrst12345678901234567890"));
+  }
+  {
+    typedef std::basic_string<char, std::char_traits<char>,
+                              min_allocator<char> >
+        S;
     test0(S(""), "", S(""));
     test0(S(""), "12345", S("12345"));
     test0(S(""), "1234567890", S("1234567890"));
@@ -97,13 +97,14 @@ int main()
     test0(S("abcdefghij"), "", S("abcdefghij"));
     test0(S("abcdefghij"), "12345", S("abcdefghij12345"));
     test0(S("abcdefghij"), "1234567890", S("abcdefghij1234567890"));
-    test0(S("abcdefghij"), "12345678901234567890", S("abcdefghij12345678901234567890"));
+    test0(S("abcdefghij"), "12345678901234567890",
+          S("abcdefghij12345678901234567890"));
     test0(S("abcdefghijklmnopqrst"), "", S("abcdefghijklmnopqrst"));
     test0(S("abcdefghijklmnopqrst"), "12345", S("abcdefghijklmnopqrst12345"));
-    test0(S("abcdefghijklmnopqrst"), "1234567890", S("abcdefghijklmnopqrst1234567890"));
-    test0(S("abcdefghijklmnopqrst"), "12345678901234567890", S("abcdefghijklmnopqrst12345678901234567890"));
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+    test0(S("abcdefghijklmnopqrst"), "1234567890",
+          S("abcdefghijklmnopqrst1234567890"));
+    test0(S("abcdefghijklmnopqrst"), "12345678901234567890",
+          S("abcdefghijklmnopqrst12345678901234567890"));
 
     test1(S(""), "", S(""));
     test1(S(""), "12345", S("12345"));
@@ -116,13 +117,14 @@ int main()
     test1(S("abcdefghij"), "", S("abcdefghij"));
     test1(S("abcdefghij"), "12345", S("abcdefghij12345"));
     test1(S("abcdefghij"), "1234567890", S("abcdefghij1234567890"));
-    test1(S("abcdefghij"), "12345678901234567890", S("abcdefghij12345678901234567890"));
+    test1(S("abcdefghij"), "12345678901234567890",
+          S("abcdefghij12345678901234567890"));
     test1(S("abcdefghijklmnopqrst"), "", S("abcdefghijklmnopqrst"));
     test1(S("abcdefghijklmnopqrst"), "12345", S("abcdefghijklmnopqrst12345"));
-    test1(S("abcdefghijklmnopqrst"), "1234567890", S("abcdefghijklmnopqrst1234567890"));
-    test1(S("abcdefghijklmnopqrst"), "12345678901234567890", S("abcdefghijklmnopqrst12345678901234567890"));
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    }
+    test1(S("abcdefghijklmnopqrst"), "1234567890",
+          S("abcdefghijklmnopqrst1234567890"));
+    test1(S("abcdefghijklmnopqrst"), "12345678901234567890",
+          S("abcdefghijklmnopqrst12345678901234567890"));
+  }
 #endif
 }