[libcxx] r348829 - Fix problems with char8_t stuff on compilers that don't support char8_t yet
Marshall Clow
mclow.lists at gmail.com
Mon Dec 10 22:06:50 PST 2018
Author: marshall
Date: Mon Dec 10 22:06:49 2018
New Revision: 348829
URL: http://llvm.org/viewvc/llvm-project?rev=348829&view=rev
Log:
Fix problems with char8_t stuff on compilers that don't support char8_t yet
Modified:
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
libcxx/trunk/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -27,7 +27,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <atomic> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -24,7 +24,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <filesystem> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -23,7 +23,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <istream> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -23,7 +23,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <limits> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -23,7 +23,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <locale> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -23,7 +23,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <ostream> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -27,7 +27,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <string> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -24,7 +24,7 @@ int main()
{
// ensure that the macros that are supposed to be defined in <string_view> are defined.
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp Mon Dec 10 22:06:49 2018
@@ -127,7 +127,7 @@ int main()
# endif
#endif
-#if TEST_STD_VER > 17
+#if TEST_STD_VER > 17 && defined(__cpp_char8_t)
# if !defined(__cpp_lib_char8_t)
LIBCPP_STATIC_ASSERT(false, "__cpp_lib_char8_t is not defined");
# else
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp?rev=348829&r1=348828&r2=348829&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp Mon Dec 10 22:06:49 2018
@@ -19,6 +19,7 @@
#include "test_macros.h"
+#if defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201811L
constexpr bool test_constexpr()
{
return std::char_traits<char8_t>::compare(u8"123", u8"223", 3) < 0
@@ -29,7 +30,6 @@ constexpr bool test_constexpr()
int main()
{
-#if defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201811L
assert(std::char_traits<char8_t>::compare(u8"", u8"", 0) == 0);
assert(std::char_traits<char8_t>::compare(NULL, NULL, 0) == 0);
@@ -52,5 +52,7 @@ int main()
assert(std::char_traits<char8_t>::compare(u8"124", u8"123", 3) > 0);
static_assert(test_constexpr(), "" );
-#endif
}
+#else
+int main () {}
+#endif
More information about the libcxx-commits
mailing list