diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2018-04-08 01:06:18 +0100 |
|---|---|---|
| committer | frosch <github@elsenhans.name> | 2018-04-08 11:47:26 +0200 |
| commit | 19076c24c1f3baf2a22d1fa832d5688216cf54a3 (patch) | |
| tree | e1876ee1a81cf02b42601725bb4bacb51b2bd964 /src | |
| parent | 11c592ef0fdd5109716a4a5501bef6d3517fd181 (diff) | |
| download | openttd-19076c24c1f3baf2a22d1fa832d5688216cf54a3.tar.xz | |
Fix #6690: Compilation with ICU 61
Diffstat (limited to 'src')
| -rw-r--r-- | src/language.h | 2 | ||||
| -rw-r--r-- | src/strings.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/language.h b/src/language.h index d33ba8189..ec241dbd8 100644 --- a/src/language.h +++ b/src/language.h @@ -105,7 +105,7 @@ extern LanguageList _languages; extern const LanguageMetadata *_current_language; #ifdef WITH_ICU_SORT -extern Collator *_current_collator; +extern icu::Collator *_current_collator; #endif /* WITH_ICU_SORT */ bool ReadLanguagePack(const LanguageMetadata *lang); diff --git a/src/strings.cpp b/src/strings.cpp index 1c539d934..fd7420259 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang TextDirection _current_text_dir; ///< Text direction of the currently selected language. #ifdef WITH_ICU_SORT -Collator *_current_collator = NULL; ///< Collator for the language currently in use. +icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use. #endif /* WITH_ICU_SORT */ static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. @@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) /* Create a collator instance for our current locale. */ UErrorCode status = U_ZERO_ERROR; - _current_collator = Collator::createInstance(Locale(_current_language->isocode), status); + _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status); /* Sort number substrings by their numerical value. */ if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); /* Avoid using the collator if it is not correctly set. */ |