[libc++][NFC] Remove #endif comments for really small conditionals on…

… _LIBCPP_HAS_NO_UNICODE_CHARS

We generally don't put a comment on the #endif when the #if block is so small
that it's unambiguous what the #endif refers to.

libcxx/include/__config

@@ -789,7 +789,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
 typedef unsigned short char16_t;
 typedef unsigned int   char32_t;
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
 
 #ifndef __SIZEOF_INT128__
 #define _LIBCPP_HAS_NO_INT128

libcxx/include/cstddef

@@ -65,7 +65,7 @@ template <>          struct __libcpp_is_integral<char8_t>            { enum { va
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
 template <>          struct __libcpp_is_integral<char16_t>           { enum { value = 1 }; };
 template <>          struct __libcpp_is_integral<char32_t>           { enum { value = 1 }; };
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
 template <>          struct __libcpp_is_integral<short>              { enum { value = 1 }; };
 template <>          struct __libcpp_is_integral<unsigned short>     { enum { value = 1 }; };
 template <>          struct __libcpp_is_integral<int>                { enum { value = 1 }; };

libcxx/include/iosfwd

@@ -227,7 +227,7 @@ typedef fpos<mbstate_t>    u8streampos;
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
 typedef fpos<mbstate_t>    u16streampos;
 typedef fpos<mbstate_t>    u32streampos;
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
 
 #if defined(_NEWLIB_VERSION)
 // On newlib, off_t is 'long int'

libcxx/include/string

@@ -675,7 +675,7 @@ typedef basic_string<char8_t> u8string;
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
 typedef basic_string<char16_t> u16string;
 typedef basic_string<char32_t> u32string;
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
 
 template<class _CharT, class _Traits, class _Allocator>
 class

libcxx/test/std/atomics/atomics.types.generic/integral.pass.cpp

@@ -182,7 +182,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<std::atomic_char16_t, char16_t>();
     test<std::atomic_char32_t, char32_t>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<std::atomic_wchar_t, wchar_t>();
 
     test<std::atomic_int8_t,    int8_t>();
@@ -208,7 +208,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<volatile std::atomic_char16_t, char16_t>();
     test<volatile std::atomic_char32_t, char32_t>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<volatile std::atomic_wchar_t, wchar_t>();
 
     test<volatile std::atomic_int8_t,    int8_t>();

libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp

@@ -63,7 +63,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     static_assert((std::is_same<std::atomic<char16_t>, std::atomic_char16_t>::value), "");
     static_assert((std::is_same<std::atomic<char32_t>, std::atomic_char32_t>::value), "");
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
 
 //  Added by LWG 2441
     static_assert((std::is_same<std::atomic<intptr_t>,  std::atomic_intptr_t>::value), "");

libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp

@@ -52,7 +52,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<signed char>();
     test<unsigned char>();
     test<signed short>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp

@@ -39,7 +39,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp

@@ -38,7 +38,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 16>();
     test<char32_t, 32>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 15>();
     test<unsigned short, 16>();
     test<int, 31>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp

@@ -42,7 +42,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 4>();
     test<char32_t, 9>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 4>();
     test<unsigned short, 4>();
     test<int, 9>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp

@@ -39,7 +39,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, std::denorm_absent>();
     test<char32_t, std::denorm_absent>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, std::denorm_absent>();
     test<unsigned short, std::denorm_absent>();
     test<int, std::denorm_absent>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp

@@ -41,7 +41,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, true>();
     test<unsigned short, true>();
     test<int, true>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, true>();
     test<char32_t, true>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, false>();
     test<unsigned short, true>();
     test<int, false>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, true>();
     test<unsigned short, false>();
     test<int, true>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp

@@ -45,7 +45,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>(SHRT_MIN);
     test<unsigned short>(0);
     test<int>(INT_MIN);

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp

@@ -45,7 +45,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(USHRT_MAX);
     test<char32_t>(UINT_MAX);
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>(SHRT_MAX);
     test<unsigned short>(USHRT_MAX);
     test<int>(INT_MAX);

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp

@@ -38,7 +38,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp

@@ -38,7 +38,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp

@@ -38,7 +38,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp

@@ -45,7 +45,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>(SHRT_MIN);
     test<unsigned short>(0);
     test<int>(INT_MIN);

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp

@@ -38,7 +38,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp

@@ -38,7 +38,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 0>();
     test<char32_t, 0>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 0>();
     test<unsigned short, 0>();
     test<int, 0>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp

@@ -58,7 +58,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>();
     test<char32_t>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>();
     test<unsigned short>();
     test<int>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp

@@ -38,7 +38,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, 2>();
     test<char32_t, 2>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, 2>();
     test<unsigned short, 2>();
     test<int, 2>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp

@@ -39,7 +39,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t>(0);
     test<char32_t>(0);
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short>(0);
     test<unsigned short>(0);
     test<int>(0);

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, std::round_toward_zero>();
     test<char32_t, std::round_toward_zero>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, std::round_toward_zero>();
     test<unsigned short, std::round_toward_zero>();
     test<int, std::round_toward_zero>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp

@@ -37,7 +37,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, false>();
     test<char32_t, false>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, false>();
     test<unsigned short, false>();
     test<int, false>();

libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp

@@ -44,7 +44,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<char16_t, integral_types_trap>();
     test<char32_t, integral_types_trap>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<short, integral_types_trap>();
     test<unsigned short, integral_types_trap>();
     test<int, integral_types_trap>();

libcxx/test/std/strings/basic.string.hash/strings.pass.cpp

@@ -49,7 +49,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<std::u16string>();
     test<std::u32string>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<std::wstring>();
 
   return 0;

libcxx/test/std/strings/string.view/string.view.hash/string_view.pass.cpp

@@ -64,7 +64,7 @@ int main(int, char**)
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
     test<std::u16string_view>();
     test<std::u32string_view>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
     test<std::wstring_view>();
 
   return 0;

libcxx/test/std/utilities/utility/utility.intcmp/intcmp.fail.cpp

@@ -143,7 +143,7 @@ int main() {
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
   test_uchars<char16_t>();
   test_uchars<char32_t>();
-#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
+#endif
 
   return 0;
 }