diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-02-19 02:55:12 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-02-19 02:55:12 +0000 |
| commit | 102a4fe17e1b54c2de0bb7b116198f6eb1d14e2f (patch) | |
| tree | c193a4c35b08f45882400bd6ee966a7bb542ac29 /libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc | |
| parent | 46ca1dd73c97c5bf85057d450adf4b885a427e77 (diff) | |
| download | gcc-102a4fe17e1b54c2de0bb7b116198f6eb1d14e2f.tar.gz | |
Adjust C++11/C++14 tests to work with -fchar8_t
* testsuite/21_strings/basic_string/literals/types.cc
[_GLIBCXX_USE_CHAR8_T]: Adjust expected string type for u8 literal.
* testsuite/21_strings/basic_string/literals/values.cc
[_GLIBCXX_USE_CHAR8_T]: Likewise.
* testsuite/22_locale/codecvt/char16_t.cc: Adjust for u8 literals
potentially having different type.
* testsuite/22_locale/codecvt/char32_t.cc: Likewise.
* testsuite/22_locale/codecvt/codecvt_utf8/79980.cc: Cast u8 literal
to char.
* testsuite/22_locale/codecvt/codecvt_utf8/wchar_t/1.cc: Likewise.
* testsuite/22_locale/codecvt/utf8.cc: Likewise.
* testsuite/22_locale/conversions/string/2.cc: Remove u8 prefix from
string literals only using basic character set.
* testsuite/22_locale/conversions/string/3.cc: Likewise. Cast other
u8 literals to char.
* testsuite/29_atomics/headers/atomic/macros.cc [_GLIBCXX_USE_CHAR8_T]:
Test ATOMIC_CHAR8_T_LOCK_FREE.
Add missing #error to ATOMIC_CHAR16_T_LOCK_FREE test.
* testsuite/29_atomics/headers/atomic/types_std_c++0x.cc
[_GLIBCXX_USE_CHAR8_T]: Check for std::atomic_char8_t.
* testsuite/experimental/string_view/literals/types.cc
[_GLIBCXX_USE_CHAR8_T]: Adjust expected string_view type for u8
literal.
* testsuite/experimental/string_view/literals/values.cc
[_GLIBCXX_USE_CHAR8_T]: Likewise.
From-SVN: r269006
Diffstat (limited to 'libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc')
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc b/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc index 8b0741d175f..f0d48c85c7d 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc @@ -20,6 +20,12 @@ #include <string> #include <testsuite_hooks.h> +#ifdef _GLIBCXX_USE_CHAR8_T +using std::u8string; +#else +using u8string = std::string; +#endif + void test01() { @@ -29,7 +35,7 @@ test01() #ifdef _GLIBCXX_USE_WCHAR_T std::wstring wplanet = L"Venus"s; #endif - std::string u8planet = u8"Mars"s; + u8string u8planet = u8"Mars"s; std::u16string u16planet = u"Jupiter"s; std::u32string u32planet = U"Saturn"s; @@ -37,7 +43,7 @@ test01() #ifdef _GLIBCXX_USE_WCHAR_T VERIFY( wplanet == std::wstring(L"Venus") ); #endif - VERIFY( u8planet == std::string(u8"Mars") ); + VERIFY( u8planet == u8string(u8"Mars") ); VERIFY( u16planet == std::u16string(u"Jupiter") ); VERIFY( u32planet == std::u32string(U"Saturn") ); } |