Skip to content

Commit feb6a2d

Browse files
committed
libstdc++: Use char for _Utf8_view if char8_t isn't available [PR114519]
Instead of just omitting the definition of __unicode::_Utf8_view when char8_t is disabled, we can make it use char instead. libstdc++-v3/ChangeLog: PR libstdc++/114519 * include/bits/unicode.h (_Utf8_view) [!__cpp_char8_t]: Define using char instead of char8_t. * testsuite/ext/unicode/view.cc: Use u8""sv literals to create string views, instead of std::u8string_view.
1 parent cd77e15 commit feb6a2d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

libstdc++-v3/include/bits/unicode.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,9 @@ namespace __unicode
581581
#ifdef __cpp_char8_t
582582
template<typename _View>
583583
using _Utf8_view = _Utf_view<char8_t, _View>;
584+
#else
585+
template<typename _View>
586+
using _Utf8_view = _Utf_view<char, _View>;
584587
#endif
585588
template<typename _View>
586589
using _Utf16_view = _Utf_view<char16_t, _View>;

libstdc++-v3/testsuite/ext/unicode/view.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using namespace std::string_view_literals;
1010
constexpr void
1111
test_utf8_to_utf8()
1212
{
13-
const std::u8string_view s8 = u8"£🇬🇧 €🇪🇺 æбçδé ♠♥♦♣ 🤡";
13+
const auto s8 = u8"£🇬🇧 €🇪🇺 æбçδé ♠♥♦♣ 🤡"sv;
1414
uc::_Utf8_view v(s8);
1515
VERIFY( std::ranges::distance(v) == s8.size() );
1616
VERIFY( std::ranges::equal(v, s8) );
@@ -19,7 +19,7 @@ test_utf8_to_utf8()
1919
constexpr void
2020
test_utf8_to_utf16()
2121
{
22-
const std::u8string_view s8 = u8"£🇬🇧 €🇪🇺 æбçδé ♠♥♦♣ 🤡";
22+
const auto s8 = u8"£🇬🇧 €🇪🇺 æбçδé ♠♥♦♣ 🤡"sv;
2323
const std::u16string_view s16 = u"£🇬🇧 €🇪🇺 æбçδé ♠♥♦♣ 🤡";
2424
uc::_Utf16_view v(s8);
2525
VERIFY( std::ranges::distance(v) == s16.size() );

0 commit comments

Comments
 (0)