Adjust C++11/C++14 tests to work with -fchar8_t

[thirdparty/gcc.git] / libstdc++-v3 / testsuite / 22_locale / codecvt / char32_t.cc

diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc
index fc6c93691b23d0b5315dd496acd1092b6b57ceae..8df3b2d76826d8e7e4a4cbb47a69144545f16260 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/char32_t.cc
@@ -38,11 +38,15 @@ test01()
   VERIFY(cvt->max_length() == 4);
   VERIFY(cvt->encoding() == 0);
 
-  const char u8dat[] = u8"H\U000000E4ll\U000000F6 \U0001F63F \U000056FD "
+#ifndef _GLIBCXX_USE_CHAR8_T
+  using char8_t = char;
+#endif
+  const char8_t u8dat_[] = u8"H\U000000E4ll\U000000F6 \U0001F63F \U000056FD "
     u8"\U0000222B f(\U000003BA) exp(-2\U000003C0\U000003C9) d\U000003BA "
     u8"\U0001F6BF \U0001F6BF \U0001F648 \U00000413\U00000435\U0000043E"
     u8"\U00000433\U00000440\U00000430\U00000444\U00000438\U0000044F \U0000FB05";
-  const char* const u8dat_end = std::end(u8dat);
+  const char* const u8dat = (const char*)u8dat_;
+  const char* const u8dat_end = (const char*)std::end(u8dat_);
 
   const char32_t u32dat[] = U"H\U000000E4ll\U000000F6 \U0001F63F \U000056FD "
     U"\U0000222B f(\U000003BA) exp(-2\U000003C0\U000003C9) d\U000003BA "
@@ -85,7 +89,7 @@ test01()
 
     VERIFY(res == codecvt_base::ok);
     VERIFY(from_next == u32dat_end);
-    VERIFY(std::memcmp((void*)buffer, (void*)u8dat, sizeof(u8dat)) == 0);
+    VERIFY(std::memcmp((void*)buffer, (void*)u8dat_, sizeof(u8dat_)) == 0);
 
     delete[] buffer;
   }