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:
authorYuri Gorshenin <y@mmaps.me>2015-03-31 19:21:39 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:41:35 +0300
commit9e5ac4ef2a843481e59cbe5295c785a92a374bf9 (patch)
treef6b29e544a34a4f12138224cdf9341c28ce31702 /indexer/data_header.hpp
parent25f7a7f2f32cc4db8a5bd0106ae4c8f6c6292201 (diff)
Fixed MwmSet::Register() signature.
Diffstat (limited to 'indexer/data_header.hpp')
-rw-r--r--indexer/data_header.hpp20
1 files changed, 6 insertions, 14 deletions
diff --git a/indexer/data_header.hpp b/indexer/data_header.hpp
index 499fde49ba..32a3b064f7 100644
--- a/indexer/data_header.hpp
+++ b/indexer/data_header.hpp
@@ -1,6 +1,7 @@
#pragma once
#include "coding_params.hpp"
+#include "mwm_version.hpp"
#include "../geometry/rect2d.hpp"
@@ -59,24 +60,15 @@ namespace feature
pair<int, int> GetScaleRange() const;
- enum Version
- {
- unknownVersion = -1,
- v1 = 0, // April 2011
- v2, // November 2011 (store type index, instead of raw type in mwm)
- v3, // March 2013 (store type index, instead of raw type in search data)
- lastVersion = v3
- };
-
- inline Version GetVersion() const { return m_ver; }
- inline bool IsMWMSuitable() const { return (m_ver <= lastVersion); }
+ inline version::Format GetFormat() const { return m_format; }
+ inline bool IsMWMSuitable() const { return m_format <= version::lastFormat; }
/// @name Serialization
//@{
void Save(FileWriter & w) const;
- void Load(ModelReaderPtr const & r, Version ver = unknownVersion);
- void LoadVer1(ModelReaderPtr const & r);
+ void Load(ModelReaderPtr const & r, version::Format format = version::unknownFormat);
+ void LoadV1(ModelReaderPtr const & r);
//@}
enum MapType
@@ -90,7 +82,7 @@ namespace feature
inline MapType GetType() const { return m_type; }
private:
- Version m_ver;
+ version::Format m_format;
MapType m_type;
};
}