Fixing whitespace problems

llvm-svn: 111760

52 files changed, 54 insertions, 54 deletions

diff --git a/libcxx/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp b/libcxx/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
index 66bb720e013..74b225c422c 100644
--- a/libcxx/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test new_handler
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp b/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
index 9c6fd7ce683..f3509101c01 100644
--- a/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test set_new_handler
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
index 142871d2417..f29db6147dc 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new[]
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
index da282b80393..f00397566c4 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new [] (nothrow)
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
index 91d93db1586..566ea7bccde 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new [] nothrow by replacing only operator new
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
index 3322c07feb5..d733b58db80 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new[] replacement by replacing only operator new
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
index c1ed0b4e279..925abb0729c 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
index a9c052dae3e..19a9b5fdf5e 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new (nothrow)
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
index b37b0317869..ecb1426da64 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new nothrow by replacing only operator new
 
 #include <new>
diff --git a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
index f3d014f6391..dd11b955ac7 100644
--- a/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
+++ b/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test operator new replacement
 
 #include <new>
diff --git a/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp b/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
index 9a2c549795b..bb70f334aec 100644
--- a/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
+++ b/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test set_terminate
 
 #include <exception>
diff --git a/libcxx/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp b/libcxx/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
index 53ec32c078c..9b5302585ba 100644
--- a/libcxx/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
+++ b/libcxx/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test terminate_handler
 
 #include <exception>
diff --git a/libcxx/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp b/libcxx/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
index 9ba1c80b3a5..9d3ba126d48 100644
--- a/libcxx/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
+++ b/libcxx/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test terminate
 
 #include <exception>
diff --git a/libcxx/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp b/libcxx/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
index 59ba90bc194..c113f6f2dfc 100644
--- a/libcxx/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
+++ b/libcxx/test/language.support/support.exception/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test set_unexpected
 
 #include <exception>
@@ -25,9 +25,9 @@ int main()
 {
 	std::unexpected_handler old = std::set_unexpected(f1);
     // verify there is a previous unexpected handler
-	assert(old); 
+	assert(old);
 	// verify f1 was replace with f2
-    assert(std::set_unexpected(f2) == f1);  
+    assert(std::set_unexpected(f2) == f1);
 	// verify calling original unexpected handler calls terminate
 	std::set_terminate(f3);
 	(*old)();
diff --git a/libcxx/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp b/libcxx/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
index da1dd4f43a4..50b3d346697 100644
--- a/libcxx/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
+++ b/libcxx/test/language.support/support.exception/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test unexpected_handler
 
 #include <exception>
diff --git a/libcxx/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp b/libcxx/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp
index c960c0cc5de..67cf90ae286 100644
--- a/libcxx/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp
+++ b/libcxx/test/language.support/support.exception/exception.unexpected/unexpected/unexpected.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
 // test unexpected
 
 #include <exception>
diff --git a/libcxx/test/language.support/support.initlist/types.pass.cpp b/libcxx/test/language.support/support.initlist/types.pass.cpp
index 81ee2e37bb9..866df243fb7 100644
--- a/libcxx/test/language.support/support.initlist/types.pass.cpp
+++ b/libcxx/test/language.support/support.initlist/types.pass.cpp
@@ -15,7 +15,7 @@
 //     typedef const E& reference;
 //     typedef const E& const_reference;
 //     typedef size_t   size_type;
-// 
+//
 //     typedef const E* iterator;
 //     typedef const E* const_iterator;
 
diff --git a/libcxx/test/language.support/support.limits/c.limits/cfloat.pass.cpp b/libcxx/test/language.support/support.limits/c.limits/cfloat.pass.cpp
index fe6be80b766..f121ba35f34 100644
--- a/libcxx/test/language.support/support.limits/c.limits/cfloat.pass.cpp
+++ b/libcxx/test/language.support/support.limits/c.limits/cfloat.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test cfloat
 
 #include <cfloat>
diff --git a/libcxx/test/language.support/support.limits/c.limits/climits.pass.cpp b/libcxx/test/language.support/support.limits/c.limits/climits.pass.cpp
index 1b635014e43..41709d95390 100644
--- a/libcxx/test/language.support/support.limits/c.limits/climits.pass.cpp
+++ b/libcxx/test/language.support/support.limits/c.limits/climits.pass.cpp
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
- 
+
  // test climits
 
 #include <climits>
diff --git a/libcxx/test/language.support/support.limits/limits/is_specialized.pass.cpp b/libcxx/test/language.support/support.limits/limits/is_specialized.pass.cpp
index 4cc27546001..8d0a5b22f65 100644
--- a/libcxx/test/language.support/support.limits/limits/is_specialized.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/is_specialized.pass.cpp
@@ -48,7 +48,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<signed char>();
     test<unsigned char>();
     test<signed short>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
index 56d01a6b773..2079c11828f 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
index a0a5b617605..f18426c9cc2 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 16>();
     test<char32_t, 32>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 15>();
     test<unsigned short, 16>();
     test<int, 31>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
index 8a6bfed3969..aca90a37f55 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
@@ -38,7 +38,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 4>();
     test<char32_t, 9>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 4>();
     test<unsigned short, 4>();
     test<int, 9>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
index cc284a15337..d503ddd3067 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
@@ -35,7 +35,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
index 02bfda18ccf..0b71076993f 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, std::denorm_absent>();
     test<char32_t, std::denorm_absent>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, std::denorm_absent>();
     test<unsigned short, std::denorm_absent>();
     test<int, std::denorm_absent>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
index 834a478a423..3679b7c256c 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
index e3707495b2a..52f366124a1 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
index 380168696c0..5108227de8b 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
index 55f525aa4c8..8ffe9a0d685 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
index 76422ab9d46..55bd53b7ce8 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
@@ -37,7 +37,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
index ad10a8b061f..86d83ac7665 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
index 54ac4c51b47..4e38e1c87f7 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
index 04a46fa0b9f..df187a9138d 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
index bba2351e52f..a24f8b026be 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
index 0f410b8928e..f1fb8b8fcdd 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
index e0895c53aa7..3d97ea922b9 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, false>();
     test<int, true>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
index c53e4a54c1a..964b43c9288 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
@@ -41,7 +41,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(SHRT_MIN);
     test<unsigned short>(0);
     test<int>(INT_MIN);
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
index f42d888ea80..c4487ee4344 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
@@ -41,7 +41,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(USHRT_MAX);
     test<char32_t>(UINT_MAX);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(SHRT_MAX);
     test<unsigned short>(USHRT_MAX);
     test<int>(INT_MAX);
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
index 5b1cc053840..cff85fb2b24 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
index 33fbc5154d8..fdc179c7998 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
index 6f2d4c3eb69..f4c1d02ec3e 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
index 008430044b4..d141123792d 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
@@ -41,7 +41,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(SHRT_MIN);
     test<unsigned short>(0);
     test<int>(INT_MIN);
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
index c349a3c68fe..74be7614af1 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
index 329155cf583..97926e32bb1 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
index f20d706fc53..c82aa473162 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
@@ -54,7 +54,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>();
     test<unsigned short>();
     test<int>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
index 67b22d60e25..5f2c6ff6063 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
@@ -34,7 +34,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 2>();
     test<char32_t, 2>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, 2>();
     test<unsigned short, 2>();
     test<int, 2>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
index fb5aa049830..0cc88d3b754 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
@@ -35,7 +35,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
index 1922567fc3c..ed6097f5f2f 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, std::round_toward_zero>();
     test<char32_t, std::round_toward_zero>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, std::round_toward_zero>();
     test<unsigned short, std::round_toward_zero>();
     test<int, std::round_toward_zero>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
index 67a63d3b01d..1d559cb296e 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
@@ -54,7 +54,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short>();
     test<unsigned short>();
     test<int>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
index ec591ebc9b2..f5fb44ce8e3 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();
diff --git a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
index 5a9f51fbacc..b855c4f9106 100644
--- a/libcxx/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
+++ b/libcxx/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
@@ -33,7 +33,7 @@ int main()
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif
+#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();
diff --git a/libcxx/test/language.support/support.types/nullptr_t.pass.cpp b/libcxx/test/language.support/support.types/nullptr_t.pass.cpp
index 204d740c3ec..e1cbfe391d8 100644
--- a/libcxx/test/language.support/support.types/nullptr_t.pass.cpp
+++ b/libcxx/test/language.support/support.types/nullptr_t.pass.cpp
@@ -29,7 +29,7 @@ int main()
     // GCC 4.2 through 4.5 can't handle this
     void (A::*pmf)() = 0;
     assert(pmf == nullptr);
-#endif
+#endif  // !((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5))
     int A::*pmd = 0;
     assert(pmd == nullptr);
     A a1(nullptr);