diff options
author | Yuri Gorshenin <y@mmaps.me> | 2015-03-31 19:21:39 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:41:35 +0300 |
commit | 9e5ac4ef2a843481e59cbe5295c785a92a374bf9 (patch) | |
tree | f6b29e544a34a4f12138224cdf9341c28ce31702 /indexer/data_header.cpp | |
parent | 25f7a7f2f32cc4db8a5bd0106ae4c8f6c6292201 (diff) |
Fixed MwmSet::Register() signature.
Diffstat (limited to 'indexer/data_header.cpp')
-rw-r--r-- | indexer/data_header.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indexer/data_header.cpp b/indexer/data_header.cpp index c07ed87de7..b3fb87f147 100644 --- a/indexer/data_header.cpp +++ b/indexer/data_header.cpp @@ -93,7 +93,8 @@ namespace feature WriteVarInt(w, static_cast<int32_t>(m_type)); } - void DataHeader::Load(ModelReaderPtr const & r, Version ver /*= unknownVersion*/) + void DataHeader::Load(ModelReaderPtr const & r, + version::Format format /* = version::unknownFormat */) { ReaderSource<ModelReaderPtr> src(r); m_codingParams.Load(src); @@ -105,7 +106,7 @@ namespace feature LoadBytes(src, m_langs); m_type = static_cast<MapType>(ReadVarInt<int32_t>(src)); - m_ver = ver; + m_format = format; if (!IsMWMSuitable()) { @@ -117,7 +118,7 @@ namespace feature // Place all new serializable staff here. } - void DataHeader::LoadVer1(ModelReaderPtr const & r) + void DataHeader::LoadV1(ModelReaderPtr const & r) { ReaderSource<ModelReaderPtr> src(r); int64_t const base = ReadPrimitiveFromSource<int64_t>(src); @@ -132,6 +133,6 @@ namespace feature m_type = country; - m_ver = v1; + m_format = version::v1; } } |