- up to 1.11.1

[packages/openttd.git] / openttd-icu64.patch

--- openttd-1.6.1/src/language.h~	2019-04-13 22:53:25.090428421 +0200
+++ openttd-1.6.1/src/language.h	2019-04-13 22:46:25.201737686 +0200
@@ -111,7 +111,7 @@
 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);
--- openttd-1.6.1/src/strings.cpp~	2019-04-13 22:53:26.100481421 +0200
+++ openttd-1.6.1/src/strings.cpp	2019-04-13 22:51:17.253720586 +0200
@@ -52,7 +52,7 @@
 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.
@@ -1801,7 +1801,7 @@
 
 	/* 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. */