[libcxx-commits] [libcxx] 71752e0 - [libc++][NFC] Remove #endif comments for really small conditionals on _LIBCPP_HAS_NO_UNICODE_CHARS
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Sep 9 08:25:57 PDT 2021
Author: Louis Dionne
Date: 2021-09-09T11:25:10-04:00
New Revision: 71752e00081cb4bc55d60c186cce1a18ed12e405
URL: https://github.com/llvm/llvm-project/commit/71752e00081cb4bc55d60c186cce1a18ed12e405
DIFF: https://github.com/llvm/llvm-project/commit/71752e00081cb4bc55d60c186cce1a18ed12e405.diff
LOG: [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.
Added:
Modified:
libcxx/include/__config
libcxx/include/cstddef
libcxx/include/iosfwd
libcxx/include/string
libcxx/test/std/atomics/atomics.types.generic/integral.pass.cpp
libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp
libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
libcxx/test/std/strings/string.view/string.view.hash/string_view.pass.cpp
libcxx/test/std/utilities/utility/utility.intcmp/intcmp.fail.cpp
Removed:
################################################################################
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 2a6364155e100..d7d37bd946723 100644
--- a/libcxx/include/__config
+++ b/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
diff --git a/libcxx/include/cstddef b/libcxx/include/cstddef
index 1b54e7b2e0dc8..551bd8364f17f 100644
--- a/libcxx/include/cstddef
+++ b/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 }; };
diff --git a/libcxx/include/iosfwd b/libcxx/include/iosfwd
index 499839f7d04d1..974cb427deadc 100644
--- a/libcxx/include/iosfwd
+++ b/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'
diff --git a/libcxx/include/string b/libcxx/include/string
index 8696bdf183c8b..4ca0e86ba808b 100644
--- a/libcxx/include/string
+++ b/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
diff --git a/libcxx/test/std/atomics/atomics.types.generic/integral.pass.cpp b/libcxx/test/std/atomics/atomics.types.generic/integral.pass.cpp
index a4a480ffd0914..5f23be8772a9a 100644
--- a/libcxx/test/std/atomics/atomics.types.generic/integral.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp b/libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp
index 22a31a601256a..56e0decad48a2 100644
--- a/libcxx/test/std/atomics/atomics.types.generic/integral_typedefs.pass.cpp
+++ b/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), "");
diff --git a/libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp
index 9b8d2310d4060..b5acfbe1c71a6 100644
--- a/libcxx/test/std/language.support/support.limits/limits/is_specialized.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
index 1d21b3fc7784d..49d22dc44f7e4 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
+++ b/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);
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
index 04b49fc7ccd86..e0f8c311c53b2 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
index 725c0b9989141..bb440fbc91776 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
index b03822b169213..cc49c4b2ef102 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
+++ b/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);
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
index 7a4932e21845b..d72580c981574 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
index 350da02a73166..ebb684b73c939 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
index 58cdc0d7187b6..67745b4e7fd57 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
index ba01ee588acdd..730b86967a52a 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
index 4dd30d43794f1..799c50547fda8 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
index 9e567a8221a09..912ae16566a0b 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
+++ b/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);
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
index 15a56768bcf6f..556e402c94ec0 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
index 4020241807f6f..a257d3b4490cf 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
index eb039efd90ec7..b527194239376 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
index 8f6196a6beda5..d31795254d4f0 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
index 608c3a4759987..6495bf4933d71 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
index 8082531a486ba..c2e639afcde14 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
index 66eaac4f8e177..bc4f7a434e89a 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
+++ b/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);
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
index 4bf308b95913e..d40ac2333acac 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
+++ b/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);
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
index 127eed3e5e039..ccf1d2b2ba4b9 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
index ba36671a4fce3..9c6493ba4de51 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
index 6dcbb1443fa83..53c8a1347e063 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
index dac729d4969e3..25a59f3f3b3ff 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
+++ b/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);
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
index 6245ecd7ca847..0d4d8bf591fd3 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
index 5361ad07d482d..7e798e19d4772 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
index 11bf4a9a53e6b..761f662c863ad 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
index ec55084a65e58..7d15a0f852984 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
index 31f7333a192e0..6a39773308252 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
+++ b/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);
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
index 6b38e26366308..ad994f37e9dd9 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
index 8611730716338..dcacd25b67b32 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp b/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
index a5d212d591a25..f5000dc34b2d5 100644
--- a/libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
+++ b/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>();
diff --git a/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp b/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
index 1b3241c4ff39e..dbed700d6c110 100644
--- a/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
+++ b/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;
diff --git a/libcxx/test/std/strings/string.view/string.view.hash/string_view.pass.cpp b/libcxx/test/std/strings/string.view/string.view.hash/string_view.pass.cpp
index 502f3adbd8939..c0742ec9edad5 100644
--- a/libcxx/test/std/strings/string.view/string.view.hash/string_view.pass.cpp
+++ b/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;
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.fail.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.fail.cpp
index 0099504e2b65a..8395f287f71e2 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.fail.cpp
+++ b/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;
}
More information about the libcxx-commits
mailing list