summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2010-08-22 00:47:54 +0000
committerHoward Hinnant <hhinnant@apple.com>2010-08-22 00:47:54 +0000
commitbf2897cf455f5d001beee1a33692395fa46677cb (patch)
treeed408d3b6aed5cdd61ffad4c6dce0a0dc09a70e7 /libcxx
parentf36101dd3d86899f992962d9c546ea4425a34119 (diff)
downloadbcm5719-llvm-bf2897cf455f5d001beee1a33692395fa46677cb.tar.gz
bcm5719-llvm-bf2897cf455f5d001beee1a33692395fa46677cb.zip
Fixing whitespace problems
llvm-svn: 111764
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/test/strings/basic.string.hash/strings.pass.cpp2
-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
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp10
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp12
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp2
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp12
-rw-r--r--libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp10
-rw-r--r--libcxx/test/strings/string.classes/typedefs.pass.cpp10
105 files changed, 182 insertions, 182 deletions
diff --git a/libcxx/test/strings/basic.string.hash/strings.pass.cpp b/libcxx/test/strings/basic.string.hash/strings.pass.cpp
index a1b0a2777d6..eccb5934c3e 100644
--- a/libcxx/test/strings/basic.string.hash/strings.pass.cpp
+++ b/libcxx/test/strings/basic.string.hash/strings.pass.cpp
@@ -43,6 +43,6 @@ int main()
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
test<std::u16string>();
test<std::u32string>();
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
test<std::wstring>();
}
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>
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp
index 31b784674c2..aa00a862bfd 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp
@@ -11,11 +11,11 @@
// template<> struct char_traits<char>
-// typedef char char_type;
-// typedef int int_type;
-// typedef streamoff off_type;
-// typedef streampos pos_type;
-// typedef mbstate_t state_type;
+// typedef char char_type;
+// typedef int int_type;
+// typedef streamoff off_type;
+// typedef streampos pos_type;
+// typedef mbstate_t state_type;
#include <string>
#include <type_traits>
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
index 63f80815a03..79f6b2bcb77 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
@@ -22,5 +22,5 @@ int main()
char16_t c = u'\0';
std::char_traits<char16_t>::assign(c, u'a');
assert(c == u'a');
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
index e2a02a27845..a2413b734de 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
@@ -25,5 +25,5 @@ int main()
assert(s2[0] == char16_t(5));
assert(s2[1] == char16_t(5));
assert(s2[2] == char16_t(5));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
index d413b93f834..711d61c3158 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
@@ -38,5 +38,5 @@ int main()
assert(std::char_traits<char16_t>::compare(u"223", u"123", 3) > 0);
assert(std::char_traits<char16_t>::compare(u"133", u"123", 3) > 0);
assert(std::char_traits<char16_t>::compare(u"124", u"123", 3) > 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
index 49211511b27..2bcfe4267fc 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
@@ -25,5 +25,5 @@ int main()
assert(s2[0] == char16_t(1));
assert(s2[1] == char16_t(2));
assert(s2[2] == char16_t(3));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
index e8dcdca2c86..e09facea500 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
@@ -22,5 +22,5 @@ int main()
char16_t c = u'\0';
assert(std::char_traits<char16_t>::eq(u'a', u'a'));
assert(!std::char_traits<char16_t>::eq(u'a', u'A'));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
index 0ad101f7715..2226f0bf45f 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
@@ -24,5 +24,5 @@ int main()
assert(!std::char_traits<char16_t>::eq_int_type(std::char_traits<char16_t>::eof(), u'A'));
assert( std::char_traits<char16_t>::eq_int_type(std::char_traits<char16_t>::eof(),
std::char_traits<char16_t>::eof()));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
index ba421ce50bd..6b8c2929df5 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
@@ -25,5 +25,5 @@ int main()
assert(std::char_traits<char16_t>::find(s1, 3, char16_t(3)) == s1+2);
assert(std::char_traits<char16_t>::find(s1, 3, char16_t(4)) == 0);
assert(std::char_traits<char16_t>::find(s1, 3, char16_t(0)) == 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
index 12f9dfc2357..1cb99c4f340 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
@@ -24,5 +24,5 @@ int main()
assert(std::char_traits<char16_t>::length(u"aa") == 2);
assert(std::char_traits<char16_t>::length(u"aaa") == 3);
assert(std::char_traits<char16_t>::length(u"aaaa") == 4);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
index 544c0d27eef..7322435b1a6 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
@@ -22,5 +22,5 @@ int main()
char16_t c = u'\0';
assert(!std::char_traits<char16_t>::lt(u'a', u'a'));
assert( std::char_traits<char16_t>::lt(u'A', u'a'));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
index d1eb1621772..dd9a0a0285d 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
@@ -29,5 +29,5 @@ int main()
assert(s1[0] == char16_t(2));
assert(s1[1] == char16_t(2));
assert(s1[2] == char16_t(3));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
index b20011dcdf1..ecfbe7c4ec3 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
@@ -24,5 +24,5 @@ int main()
assert(std::char_traits<char16_t>::not_eof(0) == 0);
assert(std::char_traits<char16_t>::not_eof(std::char_traits<char16_t>::eof()) !=
std::char_traits<char16_t>::eof());
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
index b7e74b0b371..be9b61254f2 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
@@ -22,5 +22,5 @@ int main()
assert(std::char_traits<char16_t>::to_char_type(u'a') == u'a');
assert(std::char_traits<char16_t>::to_char_type(u'A') == u'A');
assert(std::char_traits<char16_t>::to_char_type(0) == 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
index 6fd414821aa..c2376ac99d4 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
@@ -22,5 +22,5 @@ int main()
assert(std::char_traits<char16_t>::to_int_type(u'a') == u'a');
assert(std::char_traits<char16_t>::to_int_type(u'A') == u'A');
assert(std::char_traits<char16_t>::to_int_type(0) == 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp
index 4fe3f472bd9..e1611429f5b 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp
@@ -11,11 +11,11 @@
// template<> struct char_traits<char16_t>
-// typedef char16_t char_type;
-// typedef uint_least16_t int_type;
-// typedef streamoff off_type;
-// typedef u16streampos pos_type;
-// typedef mbstate_t state_type;
+// typedef char16_t char_type;
+// typedef uint_least16_t int_type;
+// typedef streamoff off_type;
+// typedef u16streampos pos_type;
+// typedef mbstate_t state_type;
#include <string>
#include <type_traits>
@@ -29,5 +29,5 @@ int main()
static_assert((std::is_same<std::char_traits<char16_t>::off_type, std::streamoff>::value), "");
static_assert((std::is_same<std::char_traits<char16_t>::pos_type, std::u16streampos>::value), "");
static_assert((std::is_same<std::char_traits<char16_t>::state_type, std::mbstate_t>::value), "");
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
index 0c05ccbf701..60acdd05ad6 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
@@ -22,5 +22,5 @@ int main()
char32_t c = U'\0';
std::char_traits<char32_t>::assign(c, U'a');
assert(c == U'a');
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
index 396369e6a7e..dbf8de32ceb 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
@@ -25,5 +25,5 @@ int main()
assert(s2[0] == char32_t(5));
assert(s2[1] == char32_t(5));
assert(s2[2] == char32_t(5));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
index 3dcaa8910e0..bee5dc9b53e 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
@@ -38,5 +38,5 @@ int main()
assert(std::char_traits<char32_t>::compare(U"223", U"123", 3) > 0);
assert(std::char_traits<char32_t>::compare(U"133", U"123", 3) > 0);
assert(std::char_traits<char32_t>::compare(U"124", U"123", 3) > 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
index 2ae5bdf8dda..9f24a7b312a 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
@@ -25,5 +25,5 @@ int main()
assert(s2[0] == char32_t(1));
assert(s2[1] == char32_t(2));
assert(s2[2] == char32_t(3));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
index 6eb8fd7f903..927c05242b1 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
@@ -22,5 +22,5 @@ int main()
char32_t c = U'\0';
assert(std::char_traits<char32_t>::eq(U'a', U'a'));
assert(!std::char_traits<char32_t>::eq(U'a', U'A'));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
index 2f1d68a87e0..4e0d34a08c8 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
@@ -24,5 +24,5 @@ int main()
assert(!std::char_traits<char32_t>::eq_int_type(std::char_traits<char32_t>::eof(), U'A'));
assert( std::char_traits<char32_t>::eq_int_type(std::char_traits<char32_t>::eof(),
std::char_traits<char32_t>::eof()));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
index 8313be44107..2c4605cfafd 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
@@ -25,5 +25,5 @@ int main()
assert(std::char_traits<char32_t>::find(s1, 3, char32_t(3)) == s1+2);
assert(std::char_traits<char32_t>::find(s1, 3, char32_t(4)) == 0);
assert(std::char_traits<char32_t>::find(s1, 3, char32_t(0)) == 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
index fd1f0c22bab..ab27a567974 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
@@ -24,5 +24,5 @@ int main()
assert(std::char_traits<char32_t>::length(U"aa") == 2);
assert(std::char_traits<char32_t>::length(U"aaa") == 3);
assert(std::char_traits<char32_t>::length(U"aaaa") == 4);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
index c26070944a7..32af79ea0e7 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
@@ -22,5 +22,5 @@ int main()
char32_t c = U'\0';
assert(!std::char_traits<char32_t>::lt(U'a', U'a'));
assert( std::char_traits<char32_t>::lt(U'A', U'a'));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
index ea1a600339d..a497e08f7cc 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
@@ -29,5 +29,5 @@ int main()
assert(s1[0] == char32_t(2));
assert(s1[1] == char32_t(2));
assert(s1[2] == char32_t(3));
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
index ce2ff204567..37eb484a206 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
@@ -24,5 +24,5 @@ int main()
assert(std::char_traits<char32_t>::not_eof(0) == 0);
assert(std::char_traits<char32_t>::not_eof(std::char_traits<char32_t>::eof()) !=
std::char_traits<char32_t>::eof());
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
index 96063e2411b..10eeeb60a42 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
@@ -22,5 +22,5 @@ int main()
assert(std::char_traits<char32_t>::to_char_type(U'a') == U'a');
assert(std::char_traits<char32_t>::to_char_type(U'A') == U'A');
assert(std::char_traits<char32_t>::to_char_type(0) == 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
index abccb7d2b34..be54bad5545 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
@@ -22,5 +22,5 @@ int main()
assert(std::char_traits<char32_t>::to_int_type(U'a') == U'a');
assert(std::char_traits<char32_t>::to_int_type(U'A') == U'A');
assert(std::char_traits<char32_t>::to_int_type(0) == 0);
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp
index 695336c6529..7d63304606f 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp
@@ -11,11 +11,11 @@
// template<> struct char_traits<char32_t>
-// typedef char32_t char_type;
-// typedef uint_least32_t int_type;
-// typedef streamoff off_type;
-// typedef u32streampos pos_type;
-// typedef mbstate_t state_type;
+// typedef char32_t char_type;
+// typedef uint_least32_t int_type;
+// typedef streamoff off_type;
+// typedef u32streampos pos_type;
+// typedef mbstate_t state_type;
#include <string>
#include <type_traits>
@@ -29,5 +29,5 @@ int main()
static_assert((std::is_same<std::char_traits<char32_t>::off_type, std::streamoff>::value), "");
static_assert((std::is_same<std::char_traits<char32_t>::pos_type, std::u32streampos>::value), "");
static_assert((std::is_same<std::char_traits<char32_t>::state_type, std::mbstate_t>::value), "");
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp
index 810d377902d..a1b54e15525 100644
--- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp
+++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp
@@ -11,11 +11,11 @@
// template<> struct char_traits<wchar_t>
-// typedef wchar_t char_type;
-// typedef int int_type;
-// typedef streamoff off_type;
-// typedef streampos pos_type;
-// typedef mbstate_t state_type;
+// typedef wchar_t char_type;
+// typedef int int_type;
+// typedef streamoff off_type;
+// typedef streampos pos_type;
+// typedef mbstate_t state_type;
#include <string>
#include <type_traits>
diff --git a/libcxx/test/strings/string.classes/typedefs.pass.cpp b/libcxx/test/strings/string.classes/typedefs.pass.cpp
index 5bc8fed5e3d..c92daba05a9 100644
--- a/libcxx/test/strings/string.classes/typedefs.pass.cpp
+++ b/libcxx/test/strings/string.classes/typedefs.pass.cpp
@@ -11,10 +11,10 @@
// Test for the existence of:
-// basic_string typedef names
-// typedef basic_string<char> string;
-// typedef basic_string<char16_t> u16string;
-// typedef basic_string<char32_t> u32string;
+// basic_string typedef names
+// typedef basic_string<char> string;
+// typedef basic_string<char16_t> u16string;
+// typedef basic_string<char32_t> u32string;
// typedef basic_string<wchar_t> wstring;
#include <string>
@@ -26,5 +26,5 @@ int main()
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
typedef std::u16string test3;
typedef std::u32string test4;
-#endif
+#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
OpenPOWER on IntegriCloud