[indexer] Fix tests for unique new feature category names.

1 files changed, 9 insertions, 3 deletions

diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp
index 2677a7e718..14e7f97053 100644
--- a/indexer/categories_holder.hpp
+++ b/indexer/categories_holder.hpp
@@ -35,6 +35,12 @@ public:
     }
   };
 
+  struct Mapping
+  {
+    char const * m_name;
+    int8_t m_code;
+  };
+
 private:
   typedef strings::UniString StringT;
   typedef multimap<uint32_t, shared_ptr<Category> > Type2CategoryContT;
@@ -45,8 +51,9 @@ private:
   Name2CatContT m_name2type;
 
 public:
-  static size_t const kNumLanguages;
-  static size_t const kEnglishCode;
+  static int8_t const kEnglishCode;
+  static int8_t const kUnsupportedLocaleCode;
+  static vector<Mapping> const kLocaleMapping;
 
   explicit CategoriesHolder(unique_ptr<Reader> && reader);
   void LoadFromStream(istream & s);
@@ -114,7 +121,6 @@ public:
 
   /// Converts any language locale from UI to internal integer code
   static int8_t MapLocaleToInteger(string const & locale);
-  static constexpr int8_t kUnsupportedLocaleCode = -1;
 
 private:
   void AddCategory(Category & cat, vector<uint32_t> & types);