Fixing whitespace problems
llvm-svn: 111764
diff --git a/libcxx/test/strings/basic.string/input_iterator.h b/libcxx/test/strings/basic.string/input_iterator.h
index 5d1a1b0..37939a2 100644
--- a/libcxx/test/strings/basic.string/input_iterator.h
+++ b/libcxx/test/strings/basic.string/input_iterator.h
@@ -29,4 +29,4 @@
{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 bbde44d..c6e34e1 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 9b76f1b..36b4fe4 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 @@
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 82cb44c..7a75fdd 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 @@
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 0b64a0c..8af19b7 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 6313e48..93553c6 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 @@
assert(s2.get_allocator() == s1.get_allocator());
}
-#endif
+#endif // _LIBCPP_MOVE
int main()
{
@@ -41,5 +41,5 @@
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 74c80be..3acb0055 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 @@
assert(s2.get_allocator() == a);
}
-#endif
+#endif // _LIBCPP_MOVE
int main()
{
@@ -41,5 +41,5 @@
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 bc7ca14..4d604b2 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 @@
assert(s1.capacity() >= s1.size());
}
-#endif
+#endif // _LIBCPP_MOVE
int main()
{
@@ -52,5 +52,5 @@
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 f23e15e..bde0480 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 88c5062..61d0d1e 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 44690d7..c1b0806 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 @@
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 fc2acea..8b1711b 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 8aea4b8..622bc51 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 1c9a07e..f6d1d78 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 aa37380..c890653 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 25de33e..9eb17b58 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 f590e55..36ea5ca 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 @@
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 b40e2a7..ffbc2bd 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 9d8ddfc..aa89998 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 fae6895..2b23095 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 3c9247f..6044dc1 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 93fb5fe..44b856b 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 a20e86b..4d7f223 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 ffe8779..7efdeff 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 e4727df..b64385d 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 @@
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 288a945..b89ea8f 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 48573fb..83edaf6 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 20a3563..41f5fe7 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 104e24b..d29e748 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 78f40e2..68fc7f0 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 7aa5e35..19410b55 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 f039d91..cd32b4b 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 @@
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 5b8d1a5..c227c35 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 c2453d1..f9de133 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 @@
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 264e4f1..3adae2e 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 5aa1683..67863a4 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 5d13fdb..6f7ef9a 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 28f0883..cccb9de 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 32b1446..80346da 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 3e1d5a4..a01bba8 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 d4e1410..1671327 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 5dc4821..ebbb6e6 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 c0634f8..ea83ce5 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 9b503119..99dfdb3 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 8f0eddc..6cd704b 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 @@
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 4e10741..2a999cb 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 @@
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 0b74ef0..5c6f51e 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\041=/pointer_string.pass.cpp" "b/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp"
index 3a9451a..83fe1c6 100644
--- "a/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp"
+++ "b/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/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\041=/string_pointer.pass.cpp" "b/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp"
index ef9bf67..026d665 100644
--- "a/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp"
+++ "b/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/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\041=/string_string.pass.cpp" "b/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp"
index 0a102d5..4bd8068 100644
--- "a/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp"
+++ "b/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/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 a6d0d4f..cbf046c 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 @@
assert(lhs + move(rhs) == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -54,5 +54,5 @@
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 53df0a4..9a8dced 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 @@
assert(lhs + move(rhs) == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -78,5 +78,5 @@
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 6a99529..b55252e 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 @@
assert(move(lhs) + rhs == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -54,5 +54,5 @@
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 fd06a48..afe6735 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 @@
assert(move(lhs) + rhs == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -78,5 +78,5 @@
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 05ec210..ef11400 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 @@
assert(move(lhs) + move(rhs) == x);
}
-#endif
+#endif // _LIBCPP_MOVE
typedef std::string S;
@@ -138,5 +138,5 @@
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 c0db6d7..8e04b15 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 ee4f5bf..de6894a 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 fcc02d5..ac2de4e 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 06db6ac..90310b7 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 61e0096..8a25ed9 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 0ac07fa..77465ca 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 3e8078f..cfed430 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 6095b13..3edf448 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 0315ae1..0bb2b67 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 92c3221..cc2ae61 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 ea54651..4da6f14 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 b8805d4..e13b1c0 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 6b2312f..57e5aff 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 0bb4ab7..d23ec53 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 f5c3362..b417495 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 a949a25..001ca98 100644
--- a/libcxx/test/strings/basic.string/test_allocator.h
+++ b/libcxx/test/strings/basic.string/test_allocator.h
@@ -67,4 +67,4 @@
{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 885d50b..45268f7 100644
--- a/libcxx/test/strings/basic.string/test_traits.h
+++ b/libcxx/test/strings/basic.string/test_traits.h
@@ -7,4 +7,4 @@
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 9911a93..5472726 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>