iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(updated-macos-build): prefix icu method calls (icu::BreakIterator, icu::Locale, icu::UnicodeString)

This commit is contained in:
sidneys 2018-03-31 02:57:19 +02:00
parent 40a0fb5910
commit d4461f65be
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libaegisub/common/character_count.cpp
View File

@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
static std::once_flag token; static std::once_flag token;
std::call_once(token, [&] { std::call_once(token, [&] {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status)); bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator"); if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
}); });
@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
size_t count = 0; size_t count = 0;
auto pos = character_bi.first(); auto pos = character_bi.first();
for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) { for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
if (!mask) if (!mask)
++count; ++count;
else { else {
@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
auto& bi = get_break_iterator(&str[0], str.size()); auto& bi = get_break_iterator(&str[0], str.size());
for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) { for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
if (end == BreakIterator::DONE) if (end == icu::BreakIterator::DONE)
return str.size(); return str.size();
if (n == 0) if (n == 0)
return pos; return pos;

4
src/utils.cpp
View File

@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
} }
wxString LocalizedLanguageName(wxString const& lang) { wxString LocalizedLanguageName(wxString const& lang) {
Locale iculoc(lang.c_str()); icu::Locale iculoc(lang.c_str());
if (!iculoc.isBogus()) { if (!iculoc.isBogus()) {
UnicodeString ustr; icu::UnicodeString ustr;
iculoc.getDisplayName(iculoc, ustr); iculoc.getDisplayName(iculoc, ustr);
#ifdef _MSC_VER #ifdef _MSC_VER
return wxString(ustr.getBuffer()); return wxString(ustr.getBuffer());