Fix problems with char8_t stuff on compilers that don't support char8_t yet

llvm-svn: 348829

10 files changed, 13 insertions, 11 deletions

diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
index a990cab9bdf..78ee09d2f7f 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
index 160a997cecb..4d03634c292 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
index dfa0052e43f..7ede323ca5a 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
index 5d4997153d7..7f18692370b 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
index 4c45c0a5449..60227332987 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
index 5f2ffb29653..668b39e3235 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
index 02aa15c77cc..2f408b9886e 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
index 82f1c66ddd1..bbdeb0b5ac3 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
index f4be2eb0920..e2179e08a83 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
@@ -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
diff --git a/libcxx/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp b/libcxx/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp
index 0ce036a9781..5ab1c9f0be0 100644
--- a/libcxx/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp
+++ b/libcxx/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char8_t/compare.pass.cpp
@@ -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