From 74d3e7e798718a45787b0062f22d9a99cf8f64aa Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Mon, 29 Jun 2020 20:09:06 +0300 Subject: [PATCH] [indexer] Fix variables initialization order: kSimilarToDeviceLanguages which depends from kLanguages(string_utf8_multilang.cpp) should not be global. --- indexer/feature_utils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp index 49a1e97574..f37716d331 100644 --- a/indexer/feature_utils.cpp +++ b/indexer/feature_utils.cpp @@ -31,11 +31,6 @@ int8_t GetIndex(string const & lang) return StrUtf8::GetLangIndex(lang); } -unordered_map> const kSimilarToDeviceLanguages = -{ - {GetIndex("be"), {GetIndex("ru")}} -}; - void GetMwmLangName(feature::RegionData const & regionData, StringUtf8Multilang const & src, string & out) { vector mwmLangCodes; @@ -101,6 +96,11 @@ bool GetBestName(StringUtf8Multilang const & src, vector const & priorit vector GetSimilarToDeviceLanguages(int8_t deviceLang) { + static unordered_map> const kSimilarToDeviceLanguages = + { + {GetIndex("be"), {GetIndex("ru")}} + }; + auto const it = kSimilarToDeviceLanguages.find(deviceLang); if (it != kSimilarToDeviceLanguages.cend()) return it->second;