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
diff options
context:
space:
mode:
authortatiana-yan <tatiana.kondakova@gmail.com>2018-10-12 17:50:40 +0300
committermpimenov <mpimenov@users.noreply.github.com>2018-10-12 18:46:03 +0300
commit5b3b8c470c4207799b0dcd2adeee14984b1ffe8d (patch)
tree98080a5a6f4d78a19e076064170d2280794e4453 /indexer
parentf3a5ddff9c5fa53b0c9b05d65a08e5aa3ee3c141 (diff)
[indexer] Move Classificator private methods to the bottom.
Diffstat (limited to 'indexer')
-rw-r--r--indexer/classificator.hpp34
1 files changed, 16 insertions, 18 deletions
diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp
index 7e81856efb..565a7dbb57 100644
--- a/indexer/classificator.hpp
+++ b/indexer/classificator.hpp
@@ -157,16 +157,6 @@ inline void swap(ClassifObject & r1, ClassifObject & r2)
class Classificator
{
- DISALLOW_COPY_AND_MOVE(Classificator);
-
- ClassifObject m_root;
-
- IndexAndTypeMapping m_mapping;
-
- uint32_t m_coastType;
-
- static ClassifObject * AddV(ClassifObject * parent, std::string const & key, std::string const & value);
-
public:
Classificator() : m_root("world") {}
@@ -184,14 +174,6 @@ public:
bool HasTypesMapping() const { return m_mapping.IsLoaded(); }
- /// Return type by path in classificator tree, for example
- /// path = ["natural", "caostline"].
- //@{
-private:
- template <typename Iter>
- uint32_t GetTypeByPathImpl(Iter beg, Iter end) const;
-
-public:
/// @return 0 in case of nonexisting type
uint32_t GetTypeByPathSafe(std::vector<std::string> const & path) const;
/// Invokes ASSERT in case of nonexisting type
@@ -242,6 +224,22 @@ public:
/// @return Object name to show in UI (not for debug purposes).
std::string GetReadableObjectName(uint32_t type) const;
+
+private:
+ static ClassifObject * AddV(ClassifObject * parent, std::string const & key,
+ std::string const & value);
+
+ /// Return type by path in classificator tree, for example
+ /// path = ["natural", "caostline"].
+ //@{
+ template <typename Iter>
+ uint32_t GetTypeByPathImpl(Iter beg, Iter end) const;
+
+ ClassifObject m_root;
+ IndexAndTypeMapping m_mapping;
+ uint32_t m_coastType;
+
+ DISALLOW_COPY_AND_MOVE(Classificator);
};
Classificator & classif();