GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'FlaxEngine:master' into fix/nullable

Browse Source
This commit is contained in:
Mateusz Karbowiak
2024-10-07 01:11:51 +02:00
committed by GitHub
parent cda74f5cc4 3434731c2a
commit 1a588eb9f7
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Platform/Defines.h
View File

@@ -186,8 +186,8 @@ API_ENUM() enum class ArchitectureType
#ifndef PLATFORM_ARCH_ARM64
#define PLATFORM_ARCH_ARM64 0
#endif
#ifndef PLATFORM_WCHAR_IS_CHAR16
#define PLATFORM_WCHAR_IS_CHAR16 0
#ifndef PLATFORM_TEXT_IS_CHAR16
#define PLATFORM_TEXT_IS_CHAR16 0
#endif
#ifndef PLATFORM_DEBUG_BREAK
#define PLATFORM_DEBUG_BREAK

4
Source/Engine/Platform/StringUtils.h
View File

@@ -224,7 +224,7 @@ public:
template<typename T>
static bool ParseHex(const T* str, uint32* result)
{
return StringUtils::ParseHex(str, StringUtils::Length((const T*)str), result);
return StringUtils::ParseHex(str, StringUtils::Length(str), result);
}
// Parses text to the unsigned integer value. Returns true if failed to convert the value.
@@ -321,7 +321,7 @@ public:
template<typename T, typename U>
static bool Parse(const T* str, U* result)
{
return StringUtils::Parse((const T*)str, StringUtils::Length((const T*)str), (U*)result);
return StringUtils::Parse(str, StringUtils::Length(str), result);
}
// Parses text to the scalar value. Returns true if failed to convert the value.