Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/coding
diff options
context:
space:
mode:
authorAlex Zolotarev <alex@maps.me>2015-12-09 12:15:58 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:03:54 +0300
commitc8abbb16dcff6a122dffd461af376d2f0a72d97c (patch)
treee0ca644b2f87ebc187734e9dbd451c92ee1fb7c5 /coding
parent75188c8402554d3fe5b95e822b5fd3cb78b312f0 (diff)
Moved MAX_SUPPORTED_LANGUAGES to StringUtf8Multilang.
Diffstat (limited to 'coding')
-rw-r--r--coding/multilang_utf8_string.cpp2
-rw-r--r--coding/multilang_utf8_string.hpp8
2 files changed, 7 insertions, 3 deletions
diff --git a/coding/multilang_utf8_string.cpp b/coding/multilang_utf8_string.cpp
index f27930a769..a3432c07e8 100644
--- a/coding/multilang_utf8_string.cpp
+++ b/coding/multilang_utf8_string.cpp
@@ -17,7 +17,7 @@ static char const * gLangs[] = {
int8_t StringUtf8Multilang::GetLangIndex(string const & lang)
{
- static_assert(ARRAY_SIZE(gLangs) == MAX_SUPPORTED_LANGUAGES, "");
+ static_assert(ARRAY_SIZE(gLangs) == MAX_SUPPORTED_LANGUAGES, "With current encoding we are limited to 64 languages max.");
for (size_t i = 0; i < ARRAY_SIZE(gLangs); ++i)
if (lang == gLangs[i])
diff --git a/coding/multilang_utf8_string.hpp b/coding/multilang_utf8_string.hpp
index f78834d8dd..7c0efce963 100644
--- a/coding/multilang_utf8_string.hpp
+++ b/coding/multilang_utf8_string.hpp
@@ -35,8 +35,12 @@ class StringUtf8Multilang
size_t GetNextIndex(size_t i) const;
public:
- static int8_t const UNSUPPORTED_LANGUAGE_CODE = -1;
- static int8_t const DEFAULT_CODE = 0;
+ static int8_t constexpr UNSUPPORTED_LANGUAGE_CODE = -1;
+ static int8_t constexpr DEFAULT_CODE = 0;
+ /// How many languages we support on indexing stage. See full list in cpp file.
+ /// TODO(AlexZ): Review and replace invalid languages by valid ones.
+ static int8_t constexpr MAX_SUPPORTED_LANGUAGES = 64;
+
/// @return UNSUPPORTED_LANGUAGE_CODE if language is not recognized
static int8_t GetLangIndex(string const & lang);