You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-12-06 17:25:19 +00:00
Update HarfBuzz, ICU and FreeType
HarfBuzz: Update to version 7.3.0 ICU4C: Update to version 73.1 FreeType: Update to version 2.13.0
This commit is contained in:
12
thirdparty/icu4c/common/servslkf.cpp
vendored
12
thirdparty/icu4c/common/servslkf.cpp
vendored
@@ -21,9 +21,9 @@
|
||||
#include "charstr.h"
|
||||
#include "uassert.h"
|
||||
|
||||
#define UNDERSCORE_CHAR ((UChar)0x005f)
|
||||
#define AT_SIGN_CHAR ((UChar)64)
|
||||
#define PERIOD_CHAR ((UChar)46)
|
||||
#define UNDERSCORE_CHAR ((char16_t)0x005f)
|
||||
#define AT_SIGN_CHAR ((char16_t)64)
|
||||
#define PERIOD_CHAR ((char16_t)46)
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
@@ -57,14 +57,14 @@ SimpleLocaleKeyFactory::SimpleLocaleKeyFactory(UObject* objToAdopt,
|
||||
SimpleLocaleKeyFactory::~SimpleLocaleKeyFactory()
|
||||
{
|
||||
delete _obj;
|
||||
_obj = NULL;
|
||||
_obj = nullptr;
|
||||
}
|
||||
|
||||
UObject*
|
||||
SimpleLocaleKeyFactory::create(const ICUServiceKey& key, const ICUService* service, UErrorCode& status) const
|
||||
{
|
||||
if (U_SUCCESS(status)) {
|
||||
const LocaleKey& lkey = (const LocaleKey&)key;
|
||||
const LocaleKey& lkey = static_cast<const LocaleKey&>(key);
|
||||
if (_kind == LocaleKey::KIND_ANY || _kind == lkey.kind()) {
|
||||
UnicodeString keyID;
|
||||
lkey.currentID(keyID);
|
||||
@@ -73,7 +73,7 @@ SimpleLocaleKeyFactory::create(const ICUServiceKey& key, const ICUService* servi
|
||||
}
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
//UBool
|
||||
|
||||
Reference in New Issue
Block a user