diff options
| author | Alexander Nikforov <nikiforov.al@gmail.com> | 2023-03-07 00:34:55 (GMT) |
|---|---|---|
| committer | Alexander Nikforov <nikiforov.al@gmail.com> | 2023-03-07 00:34:55 (GMT) |
| commit | 92f0d72507801f2d47533bfb2ad8960d93ed0224 (patch) | |
| tree | e55a95fdffae4aca51852320330a8f1e6b915a22 /googletest | |
| parent | 2d4f208765af7fa376b878860a7677ecc0bc390a (diff) | |
| download | googletest-92f0d72507801f2d47533bfb2ad8960d93ed0224.zip googletest-92f0d72507801f2d47533bfb2ad8960d93ed0224.tar.gz googletest-92f0d72507801f2d47533bfb2ad8960d93ed0224.tar.bz2 | |
__cpp_char8_t does not cover std::u8string implementation, but __cpp_lib_char8_t doesrefs/pull/4182/head
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/include/gtest/gtest-printers.h | 2 | ||||
| -rw-r--r-- | googletest/src/gtest-printers.cc | 2 | ||||
| -rw-r--r-- | googletest/test/googletest-printers-test.cc | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index 739d545..09f7316 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -1003,7 +1003,7 @@ template <> class UniversalTersePrinter<char*> : public UniversalTersePrinter<const char*> { }; -#ifdef __cpp_char8_t +#ifdef __cpp_lib_char8_t template <> class UniversalTersePrinter<const char8_t*> { public: diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc index d475ad3..de740e7 100644 --- a/googletest/src/gtest-printers.cc +++ b/googletest/src/gtest-printers.cc @@ -528,7 +528,7 @@ void PrintStringTo(const ::std::string& s, ostream* os) { } } -#ifdef __cpp_char8_t +#ifdef __cpp_lib_char8_t void PrintU8StringTo(const ::std::u8string& s, ostream* os) { PrintCharsAsStringTo(s.data(), s.size(), os); } diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc index 34aa924..23c30f1 100644 --- a/googletest/test/googletest-printers-test.cc +++ b/googletest/test/googletest-printers-test.cc @@ -532,7 +532,9 @@ TEST(PrintU8StringTest, NonConst) { EXPECT_EQ(PrintPointer(p) + " pointing to u8\"\\xE4\\xB8\\x96\"", Print(static_cast<char8_t*>(p))); } +#endif +#ifdef __cpp_lib_char8_t // NULL u8 string. TEST(PrintU8StringTest, Null) { const char8_t* p = nullptr; @@ -936,7 +938,7 @@ TEST(PrintWideStringTest, StringAmbiguousHex) { } #endif // GTEST_HAS_STD_WSTRING -#ifdef __cpp_char8_t +#ifdef __cpp_lib_char8_t TEST(PrintStringTest, U8String) { std::u8string str = u8"Hello, 世界"; EXPECT_EQ(str, str); // Verify EXPECT_EQ compiles with this type. |