summaryrefslogtreecommitdiffstats
path: root/libcxx/test/strings/basic.string
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/strings/basic.string')
-rw-r--r--libcxx/test/strings/basic.string/input_iterator.h2
-rw-r--r--libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.cons/move.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp6
-rw-r--r--libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.cons/substr.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_op+=/initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_op+=/string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp10
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp10
-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.cpp10
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp22
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string/test_allocator.h2
-rw-r--r--libcxx/test/strings/basic.string/test_traits.h2
-rw-r--r--libcxx/test/strings/basic.string/types.pass.cpp32
73 files changed, 128 insertions, 128 deletions
diff --git a/libcxx/test/strings/basic.string/input_iterator.h b/libcxx/test/strings/basic.string/input_iterator.h
index 5d1a1b0b15e..37939a2e29a 100644
--- a/libcxx/test/strings/basic.string/input_iterator.h
+++ b/libcxx/test/strings/basic.string/input_iterator.h
@@ -29,4 +29,4 @@ public:
{return !(x == y);}
};
-#endif
+#endif // INPUT_ITERATOR_H
diff --git a/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
index bbde44d01eb..c6e34e1b85c 100644
--- a/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// operator=(const basic_string<charT,traits,Allocator>& str);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
index 9b76f1bb394..36b4fe47998 100644
--- a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
@@ -28,5 +28,5 @@ int main()
s = {L'a', L'b', L'c'};
assert(s == L"abc");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
index 82cb44cf115..7a75fddeac3 100644
--- a/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
@@ -22,5 +22,5 @@ int main()
s = {'a', 'b', 'c'};
assert(s == "abc");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
index 0b64a0c64e0..8af19b76230 100644
--- a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// template<class InputIterator>
-// basic_string(InputIterator begin, InputIterator end,
+// template<class InputIterator>
+// basic_string(InputIterator begin, InputIterator end,
// const Allocator& a = Allocator());
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
index 6313e48e892..93553c6f96d 100644
--- a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
@@ -31,7 +31,7 @@ test(S s0)
assert(s2.get_allocator() == s1.get_allocator());
}
-#endif
+#endif // _LIBCPP_MOVE
int main()
{
@@ -41,5 +41,5 @@ int main()
test(S(A(3)));
test(S("1", A(5)));
test(S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)));
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
index 74c80be035a..3acb0055e70 100644
--- a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
@@ -31,7 +31,7 @@ test(S s0, const typename S::allocator_type& a)
assert(s2.get_allocator() == a);
}
-#endif
+#endif // _LIBCPP_MOVE
int main()
{
@@ -41,5 +41,5 @@ int main()
test(S(), A(3));
test(S("1"), A(5));
test(S("1234567890123456789012345678901234567890123456789012345678901234567890"), A(7));
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
index bc7ca146709..4d604b28b96 100644
--- a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// operator=(basic_string<charT,traits,Allocator>&& str);
#include <string>
@@ -31,7 +31,7 @@ test(S s1, S s2)
assert(s1.capacity() >= s1.size());
}
-#endif
+#endif // _LIBCPP_MOVE
int main()
{
@@ -52,5 +52,5 @@ int main()
test(S("1234567890123456789012345678901234567890123456789012345678901234567890"
"1234567890123456789012345678901234567890123456789012345678901234567890"),
S("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"));
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
index f23e15e9064..bde0480dd8c 100644
--- a/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// operator=(const charT* s);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
index 88c50621b17..61d0d1ead19 100644
--- a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// basic_string(const basic_string<charT,traits,Allocator>& str,
-// size_type pos, size_type n = npos,
+// basic_string(const basic_string<charT,traits,Allocator>& str,
+// size_type pos, size_type n = npos,
// const Allocator& a = Allocator());
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
index 44690d7bcf1..c1b0806893c 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
@@ -22,5 +22,5 @@ int main()
s.append({'a', 'b', 'c'});
assert(s == "123abc");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
index fc2acea4bc1..8b1711b6c32 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class InputIterator>
+// template<class InputIterator>
// basic_string& append(InputIterator first, InputIterator last);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
index 8aea4b80bd9..622bc51cf94 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// append(const charT* s, size_type n);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
index 1c9a07ec9cf..f6d1d78e5dc 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// append(size_type n, charT c);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
index aa37380415f..c890653c8cb 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// append(const basic_string<charT,traits>& str);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
index 25de33e4594..9eb17b589fd 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// append(const basic_string<charT,traits>& str, size_type pos, size_type n);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
index f590e55e481..36ea5cac37d 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
@@ -22,5 +22,5 @@ int main()
s.assign({'a', 'b', 'c'});
assert(s == "abc");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
index b40e2a703c2..ffbc2bd82ce 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class InputIterator>
+// template<class InputIterator>
// basic_string& assign(InputIterator first, InputIterator last);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
index 9d8ddfce42f..aa8999832b4 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// assign(const charT* s, size_type n);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
index fae6895fbce..2b230951e0d 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// assign(basic_string<charT,traits>&& str);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
index 3c9247fdd32..6044dc10473 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// assign(size_type n, charT c);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
index 93fb5fecff4..44b856bd4b2 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// assign(const basic_string<charT,traits>& str);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
index a20e86b4e79..4d7f223d19f 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// assign(const basic_string<charT,traits>& str, size_type pos, size_type n);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
index ffe8779bca4..7efdefffb76 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// erase(size_type pos = 0, size_type n = npos);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
index e4727df1572..b64385db19a 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
@@ -23,5 +23,5 @@ int main()
assert(i - s.begin() == 3);
assert(s == "123abc456");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
index 288a9450af8..b89ea8f248a 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class InputIterator>
+// template<class InputIterator>
// iterator insert(const_iterator p, InputIterator first, InputIterator last);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
index 48573fbc568..83edaf68d65 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// insert(size_type pos, const charT* s);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
index 20a35633924..41f5fe7e5bd 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// insert(size_type pos, const charT* s, size_type n);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
index 104e24b2134..d29e74896e9 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// insert(size_type pos, size_type n, charT c);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
index 78f40e23757..68fc7f016cd 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// insert(size_type pos1, const basic_string& str);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
index 7aa5e35d4a8..19410b55f96 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// basic_string<charT,traits,Allocator>&
-// insert(size_type pos1, const basic_string<charT,traits,Allocator>& str,
+// basic_string<charT,traits,Allocator>&
+// insert(size_type pos1, const basic_string<charT,traits,Allocator>& str,
// size_type pos2, size_type n);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op+=/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op+=/initializer_list.pass.cpp
index f039d91c3d1..cd32b4b767d 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_op+=/initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_op+=/initializer_list.pass.cpp
@@ -22,5 +22,5 @@ int main()
s += {'a', 'b', 'c'};
assert(s == "123abc");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op+=/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op+=/string.pass.cpp
index 5b8d1a51eea..c227c35dcfd 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_op+=/string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_op+=/string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// operator+=(const basic_string<charT,traits,Allocator>& str);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
index c2453d1ceae..f9de1333b81 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
@@ -22,5 +22,5 @@ int main()
s.replace(s.begin() + 3, s.begin() + 6, {'a', 'b', 'c'});
assert(s == "123abc456");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
index 264e4f1f080..3adae2ea8f5 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class InputIterator>
+// template<class InputIterator>
// basic_string&
// replace(iterator i1, iterator i2, InputIterator j1, InputIterator j2);
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
index 5aa16838d8e..67863a46713 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(iterator i1, iterator i2, const charT* s);
#include <stdio.h>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
index 5d13fdb3b37..6f7ef9a1f62 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(iterator i1, iterator i2, const charT* s, size_type n);
#include <stdio.h>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
index 28f0883f103..cccb9dedd5b 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(iterator i1, iterator i2, size_type n, charT c);
#include <stdio.h>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
index 32b14464506..80346da2fe4 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(iterator i1, iterator i2, const basic_string& str);
#include <stdio.h>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
index 3e1d5a469db..a01bba83286 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(size_type pos, size_type n1, const charT* s);
#include <stdio.h>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
index d4e14101743..16713274da5 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(size_type pos, size_type n1, const charT* s, size_type n2);
#include <stdio.h>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
index 5dc48214ef0..ebbb6e6e863 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(size_type pos, size_type n1, size_type n2, charT c);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
index c0634f8d235..ea83ce57c70 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// basic_string<charT,traits,Allocator>&
+// basic_string<charT,traits,Allocator>&
// replace(size_type pos1, size_type n1, const basic_string<charT,traits,Allocator>& str);
#include <stdio.h>
diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
index 9b503119f0a..99dfdb3e9a2 100644
--- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// basic_string<charT,traits,Allocator>&
-// replace(size_type pos1, size_type n1, const basic_string<charT,traits,Allocator>& str,
+// basic_string<charT,traits,Allocator>&
+// replace(size_type pos1, size_type n1, const basic_string<charT,traits,Allocator>& str,
// size_type pos2, size_type n2);
#include <stdio.h>
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 8f0eddc4eba..6cd704bdeb6 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
@@ -31,5 +31,5 @@ int main()
getline(std::wistringstream(L" abc* def* ghij"), s, L'*');
assert(s == L" abc");
}
-#endif
+#endif // _LIBCPP_MOVE
}
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 4e10741a6a9..2a999cbf27c 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
@@ -31,5 +31,5 @@ int main()
getline(std::wistringstream(L" abc\n def\n ghij"), s);
assert(s == L" abc");
}
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
index 0b74ef05b4f..5c6f51e4f90 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// void swap(basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// void swap(basic_string<charT,traits,Allocator>& lhs,
// basic_string<charT,traits,Allocator>& rhs);
#include <string>
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 3a9451ad23c..83fe1c69545 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
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator!=(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs);
#include <string>
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 ef9bf6725ab..026d66566da 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
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator!=(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs);
#include <string>
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 0a102d5fc7a..4bd806814fc 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
@@ -9,8 +9,8 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// bool operator!=(const basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// bool operator!=(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
#include <string>
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 a6d0d4f43d6..cbf046c78c2 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
@@ -9,11 +9,11 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// basic_string<charT,traits,Allocator>
+// template<class charT, class traits, class Allocator>
+// basic_string<charT,traits,Allocator>
// operator+(charT lhs, const basic_string<charT,traits,Allocator>& rhs);
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>&&
// operator+(charT lhs, basic_string<charT,traits,Allocator>&& rhs);
@@ -36,7 +36,7 @@ test1(typename S::value_type lhs, S&& rhs, const S& x)
assert(lhs + move(rhs) == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -54,5 +54,5 @@ int main()
test1('a', S("1234567890"), S("a1234567890"));
test1('a', S("12345678901234567890"), S("a12345678901234567890"));
-#endif
+#endif // _LIBCPP_MOVE
}
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 53df0a45c18..9a8dcedff13 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
@@ -9,11 +9,11 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// basic_string<charT,traits,Allocator>
+// template<class charT, class traits, class Allocator>
+// basic_string<charT,traits,Allocator>
// operator+(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs);
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>&&
// operator+(const charT* lhs, basic_string<charT,traits,Allocator>&& rhs);
@@ -36,7 +36,7 @@ test1(const typename S::value_type* lhs, S&& rhs, const S& x)
assert(lhs + move(rhs) == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -78,5 +78,5 @@ int main()
test1("abcdefghijklmnopqrst", S("1234567890"), S("abcdefghijklmnopqrst1234567890"));
test1("abcdefghijklmnopqrst", S("12345678901234567890"), S("abcdefghijklmnopqrst12345678901234567890"));
-#endif
+#endif // _LIBCPP_MOVE
}
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 6a99529de31..b55252e680c 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
@@ -9,11 +9,11 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>
// operator+(const basic_string<charT,traits,Allocator>& lhs, charT rhs);
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>&&
// operator+(basic_string<charT,traits,Allocator>&& lhs, charT rhs);
@@ -36,7 +36,7 @@ test1(S&& lhs, typename S::value_type rhs, const S& x)
assert(move(lhs) + rhs == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -54,5 +54,5 @@ int main()
test1(S("abcdefghij"), '1', S("abcdefghij1"));
test1(S("abcdefghijklmnopqrst"), '1', S("abcdefghijklmnopqrst1"));
-#endif
+#endif // _LIBCPP_MOVE
}
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 fd06a480b6c..afe67356c72 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
@@ -9,11 +9,11 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// basic_string<charT,traits,Allocator>
+// template<class charT, class traits, class Allocator>
+// basic_string<charT,traits,Allocator>
// operator+(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs);
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>&&
// operator+(basic_string<charT,traits,Allocator>&& lhs, const charT* rhs);
@@ -36,7 +36,7 @@ test1(S&& lhs, const typename S::value_type* rhs, const S& x)
assert(move(lhs) + rhs == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -78,5 +78,5 @@ int main()
test1(S("abcdefghijklmnopqrst"), "1234567890", S("abcdefghijklmnopqrst1234567890"));
test1(S("abcdefghijklmnopqrst"), "12345678901234567890", S("abcdefghijklmnopqrst12345678901234567890"));
-#endif
+#endif // _LIBCPP_MOVE
}
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 05ec210948e..ef11400c43e 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
@@ -9,24 +9,24 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// basic_string<charT,traits,Allocator>
-// operator+(const basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// basic_string<charT,traits,Allocator>
+// operator+(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>&&
-// operator+(const basic_string<charT,traits,Allocator>&& lhs,
+// operator+(const basic_string<charT,traits,Allocator>&& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>&&
-// operator+(const basic_string<charT,traits,Allocator>& lhs,
+// operator+(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>&& rhs);
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// basic_string<charT,traits,Allocator>&&
-// operator+(const basic_string<charT,traits,Allocator>&& lhs,
+// operator+(const basic_string<charT,traits,Allocator>&& lhs,
// const basic_string<charT,traits,Allocator>&& rhs);
#include <string>
@@ -62,7 +62,7 @@ test3(S&& lhs, S&& rhs, const S& x)
assert(move(lhs) + move(rhs) == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -138,5 +138,5 @@ int main()
test3(S("abcdefghijklmnopqrst"), S("1234567890"), S("abcdefghijklmnopqrst1234567890"));
test3(S("abcdefghijklmnopqrst"), S("12345678901234567890"), S("abcdefghijklmnopqrst12345678901234567890"));
-#endif
+#endif // _LIBCPP_MOVE
}
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
index c0db6d7e94b..8e04b151026 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator==(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
index ee4f5bf3a4d..de6894a9ad7 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
index fcc02d5285e..ac2de4ed749 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// bool operator==(const basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// bool operator==(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
index 06db6ac2154..90310b736da 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator>(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
index 61e00961a72..8a25ed94dec 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator>(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
index 0ac07fa948b..77465ca0638 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// bool operator>(const basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// bool operator>(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
index 3e8078ffd78..cfed430c703 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator>=(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
index 6095b13cf64..3edf44844b4 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator>=(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
index 0315ae10dd2..0bb2b670cd0 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// bool operator>=(const basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// bool operator>=(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
index 92c32219443..cc2ae61d7b0 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator<(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
index ea54651716a..4da6f14a1c3 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator<(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
index b8805d4a86b..e13b1c081a1 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// bool operator<(const basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// bool operator<(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
index 6b2312f5c64..57e5affcc59 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator<=(const charT* lhs, const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
index 0bb4ab7b783..d23ec538961 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
@@ -9,7 +9,7 @@
// <string>
-// template<class charT, class traits, class Allocator>
+// template<class charT, class traits, class Allocator>
// bool operator<=(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
index f5c336287e6..b4174953ad6 100644
--- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
+++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
@@ -9,8 +9,8 @@
// <string>
-// template<class charT, class traits, class Allocator>
-// bool operator<=(const basic_string<charT,traits,Allocator>& lhs,
+// template<class charT, class traits, class Allocator>
+// bool operator<=(const basic_string<charT,traits,Allocator>& lhs,
// const basic_string<charT,traits,Allocator>& rhs);
#include <string>
diff --git a/libcxx/test/strings/basic.string/test_allocator.h b/libcxx/test/strings/basic.string/test_allocator.h
index a949a25166e..001ca98bd67 100644
--- a/libcxx/test/strings/basic.string/test_allocator.h
+++ b/libcxx/test/strings/basic.string/test_allocator.h
@@ -67,4 +67,4 @@ public:
{return !(x == y);}
};
-#endif
+#endif // TEST_ALLOCATOR_H
diff --git a/libcxx/test/strings/basic.string/test_traits.h b/libcxx/test/strings/basic.string/test_traits.h
index 885d50b673b..45268f7215b 100644
--- a/libcxx/test/strings/basic.string/test_traits.h
+++ b/libcxx/test/strings/basic.string/test_traits.h
@@ -7,4 +7,4 @@ struct test_traits
typedef charT char_type;
};
-#endif
+#endif // TEST_TRAITS_H
diff --git a/libcxx/test/strings/basic.string/types.pass.cpp b/libcxx/test/strings/basic.string/types.pass.cpp
index 9911a9359ee..547272620ce 100644
--- a/libcxx/test/strings/basic.string/types.pass.cpp
+++ b/libcxx/test/strings/basic.string/types.pass.cpp
@@ -11,25 +11,25 @@
// Test nested types and default template args:
-// template<class charT, class traits = char_traits<charT>,
+// template<class charT, class traits = char_traits<charT>,
// class Allocator = allocator<charT> >
// {
// public:
-// // types:
-// typedef traits traits_type;
-// typedef typename traits::char_type value_type;
-// typedef Allocator allocator_type;
-// typedef typename Allocator::size_type size_type;
-// typedef typename Allocator::difference_type difference_type;
-// typedef typename Allocator::reference reference;
-// typedef typename Allocator::const_reference const_reference;
-// typedef typename Allocator::pointer pointer;
-// typedef typename Allocator::const_pointer const_pointer;
-// typedef implementation-defined iterator; // See 23.1
-// typedef implementation-defined const_iterator; // See 23.1
-// typedef std::reverse_iterator<iterator> reverse_iterator;
-// typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-// static const size_type npos = -1;
+// // types:
+// typedef traits traits_type;
+// typedef typename traits::char_type value_type;
+// typedef Allocator allocator_type;
+// typedef typename Allocator::size_type size_type;
+// typedef typename Allocator::difference_type difference_type;
+// typedef typename Allocator::reference reference;
+// typedef typename Allocator::const_reference const_reference;
+// typedef typename Allocator::pointer pointer;
+// typedef typename Allocator::const_pointer const_pointer;
+// typedef implementation-defined iterator; // See 23.1
+// typedef implementation-defined const_iterator; // See 23.1
+// typedef std::reverse_iterator<iterator> reverse_iterator;
+// typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+// static const size_type npos = -1;
// };
#include <string>
OpenPOWER on IntegriCloud