[haiku-commits] r35215 - haiku/trunk/src/kits/locale
- From: pulkomandy@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 21 Jan 2010 13:04:02 +0100 (CET)
Author: pulkomandy
Date: 2010-01-21 13:04:02 +0100 (Thu, 21 Jan 2010)
New Revision: 35215
Changeset: http://dev.haiku-os.org/changeset/35215/haiku
Modified:
haiku/trunk/src/kits/locale/LocaleRoster.cpp
Log:
Removed useless static qualifier on some variables that made them behave weird.
Modified: haiku/trunk/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/trunk/src/kits/locale/LocaleRoster.cpp 2010-01-21 11:38:16 UTC
(rev 35214)
+++ haiku/trunk/src/kits/locale/LocaleRoster.cpp 2010-01-21 12:04:02 UTC
(rev 35215)
@@ -513,9 +513,7 @@
#undef REALLY_ALL_LANGUAGES
#ifdef REALLY_ALL_LANGUAGES
- // TODO: Using static variables here looks really weird, and is probably
- // the reason why calling this method a second time will crash.
- static const char* const* icuLocaleList = Locale::getISOLanguages();
+ const char* const* icuLocaleList = Locale::getISOLanguages();
// Loop over the strings and add them to an std::set to remove
duplicates
for (i = 0; icuLocaleList[i]; i++) {
@@ -523,7 +521,7 @@
}
#else
int32_t localeCount;
- static const Locale* icuLocaleList
+ const Locale* icuLocaleList
= Locale::getAvailableLocales(localeCount);
// Loop over the strings and add them to an std::set to remove
duplicates
Other related posts:
- » [haiku-commits] r35215 - haiku/trunk/src/kits/locale - pulkomandy
