mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

String: Prevent implicit conversion warning in UTF-8 constructor

Browse source
This commit is contained in:
Anthony Nicholls 2024-05-01 14:39:09 +00:00
parent f333875386
commit bce68c2b11
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/juce_core/text/juce_String.cpp
View file

@ -362,8 +362,21 @@ String::String (CharPointer_UTF32 t, size_t maxChars) : text (StringHolderUtil
String::String (const wchar_t* t, size_t maxChars) : text (StringHolderUtils::createFromCharPointer (castToCharPointer_wchar_t (t), maxChars)) {}
#if __cpp_char8_t
String::String (const char8_t* const t) : String (fromUTF8 (t)) {}
String::String (const char8_t* t, size_t maxChars) : String (fromUTF8 (t, maxChars)) {}
String::String (const char8_t* const t) : String (CharPointer_UTF8 (reinterpret_cast<const char*> (t)))
{
/* If you get an assertion here, then you're trying to create a string using the standard C++
type for UTF-8 character representation, but the data consists of invalid UTF-8 characters!
*/
jassert (t == nullptr || CharPointer_UTF8::isValidString (reinterpret_cast<const char*> (t), std::numeric_limits<int>::max()));
}
String::String (const char8_t* t, size_t maxChars) : String (CharPointer_UTF8 (reinterpret_cast<const char*> (t)), maxChars)
{
/* If you get an assertion here, then you're trying to create a string using the standard C++
type for UTF-8 character representation, but the data consists of invalid UTF-8 characters!
*/
jassert (t == nullptr || CharPointer_UTF8::isValidString (reinterpret_cast<const char*> (t), (int) maxChars));
}
#endif
String::String (CharPointer_UTF8 start, CharPointer_UTF8 end) : text (StringHolderUtils::createFromCharPointer (start, end)) {}
@ -2145,16 +2158,19 @@ String String::fromUTF8 (const char* const buffer, int bufferSizeBytes)
return {};
if (bufferSizeBytes < 0)
return String (CharPointer_UTF8 (buffer));
{
jassert (CharPointer_UTF8::isValidString (buffer, std::numeric_limits<int>::max()));
return { CharPointer_UTF8 (buffer) };
}
jassert (CharPointer_UTF8::isValidString (buffer, bufferSizeBytes));
return String (CharPointer_UTF8 (buffer), CharPointer_UTF8 (buffer + bufferSizeBytes));
return { CharPointer_UTF8 (buffer), (size_t) bufferSizeBytes };
}
#if __cpp_char8_t
String String::fromUTF8 (const char8_t* const buffer, int bufferSizeBytes)
{
return fromUTF8 (reinterpret_cast<const char* const> (buffer), bufferSizeBytes);
return { buffer, (size_t) bufferSizeBytes };
}
#endif