diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-10-03 00:43:17 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-10-03 00:43:17 +0100 |
| commit | 1ca9de51265b0c51d44a4b9385f3a46a05de4ccb (patch) | |
| tree | c94649acd1641d836cbd9cf9d8713b319726ee7b /libstdc++-v3/testsuite/experimental/string_view | |
| parent | 8b75621078b42aa4cc41110a3388bdf65205056a (diff) | |
| download | gcc-1ca9de51265b0c51d44a4b9385f3a46a05de4ccb.tar.gz | |
Fix testsuite failures with --disable-wchar_t
* testsuite/21_strings/basic_string/literals/types.cc: Guard use of
wchar_t with _GLIBCXX_USE_WCHAR_T.
* testsuite/21_strings/basic_string/literals/values.cc: Likewise.
* testsuite/21_strings/basic_string/requirements/citerators.cc:
Likewise.
* testsuite/22_locale/messages/13631.cc: Likewise.
* testsuite/experimental/string_view/literals/types.cc: Likewise.
* testsuite/experimental/string_view/literals/values.cc: Likewise.
From-SVN: r228439
Diffstat (limited to 'libstdc++-v3/testsuite/experimental/string_view')
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/string_view/literals/types.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/string_view/literals/values.cc | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc b/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc index 8b91c99b04c..bc2b2fc0a07 100644 --- a/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc +++ b/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc @@ -32,8 +32,10 @@ test01() static_assert(std::is_same<decltype(u8"Hello"sv), std::experimental::string_view>::value, "u8\"Hello\"s is std::string_view"); +#ifdef _GLIBCXX_USE_WCHAR_T static_assert(std::is_same<decltype(L"Hello"sv), std::experimental::wstring_view>::value, "L\"Hello\"s is std::wstring_view"); +#endif static_assert(std::is_same<decltype(u"Hello"sv), std::experimental::u16string_view>::value, "u\"Hello\"s is std::u16string_view"); diff --git a/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc b/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc index d96383b9461..3dd6b78a9fc 100644 --- a/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc +++ b/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc @@ -27,15 +27,19 @@ test01() using namespace std::experimental::literals::string_view_literals; std::experimental::string_view planet = "Mercury"sv; +#ifdef _GLIBCXX_USE_WCHAR_T std::experimental::wstring_view wplanet = L"Venus"sv; +#endif std::experimental::string_view u8planet = u8"Mars"sv; - std::experimental::u16string_view u16planet = u"Juiter"sv; + std::experimental::u16string_view u16planet = u"Jupiter"sv; std::experimental::u32string_view u32planet = U"Saturn"sv; VERIFY( planet == std::experimental::string_view("Mercury") ); +#ifdef _GLIBCXX_USE_WCHAR_T VERIFY( wplanet == std::experimental::wstring_view(L"Venus") ); +#endif VERIFY( u8planet == std::experimental::string_view(u8"Mars") ); - VERIFY( u16planet == std::experimental::u16string_view(u"Juiter") ); + VERIFY( u16planet == std::experimental::u16string_view(u"Jupiter") ); VERIFY( u32planet == std::experimental::u32string_view(U"Saturn") ); } |