birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gems/Atom builds

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-07-30 18:53:50 -07:00
parent 41ad6d7b7a
commit f665f572f3
24 changed files with 159 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/std/string/conversions.h
+31 -4
View File
@@ -80,9 +80,7 @@ namespace AZStd
}
else
{
// Workaround to defer static_assert evaluation until this function is invoked by using the template parameter
using StringType = AZStd::basic_string<string::value_type, string::traits_type, Allocator1>;
static_assert(!AZStd::is_same_v<StringType, StringType>, "only wchar_t types of size 2 or 4 can be converted to utf8");
static_assert(false, "only wchar_t types of size 2 or 4 can be converted to utf8");
}
}
@@ -123,6 +121,22 @@ namespace AZStd
static_assert(!AZStd::is_same_v<StringType, StringType>, "Cannot convert a utf8 string to a wchar_t that isn't size 2 or 4");
}
}
static inline void to_wstring(wchar_t* dest, size_t destSize, const char* first, const char* last)
{
if constexpr (Size == 2)
{
Utf8::Unchecked::utf8to16(first, last, dest, destSize);
}
else if constexpr (Size == 4)
{
Utf8::Unchecked::utf8to32(first, last, dest, destSize);
}
else
{
static_assert(false, "Cannot convert a utf8 string to a wchar_t that isn't size 2 or 4");
}
}
};
}
// 21.5: numeric conversions
@@ -348,7 +362,7 @@ namespace AZStd
{
if (srcLen == 0)
{
srcLen = wcslen(str) + 1;
srcLen = wcslen(str);
}
if (srcLen > 0)
@@ -497,6 +511,19 @@ namespace AZStd
return to_wstring(dest, src.c_str(), src.length());
}
inline void to_wstring(wchar_t* dest, size_t destSize, const char* str, size_t srcLen = 0)
{
if (srcLen == 0)
{
srcLen = strlen(str) + 1;
}
if (srcLen > 0)
{
Internal::WCharTPlatformConverter<>::to_wstring(dest, destSize, str, str + srcLen + 1); // copy null terminator
}
}
// Convert a range of chars to lower case
#if defined(AZSTD_USE_OLD_RW_STL)
template<class Iterator>