diff options
| author | tatiana-kondakova <tatiana.kondakova@gmail.com> | 2018-01-29 16:36:12 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-01-30 13:30:27 +0300 |
| commit | ff52dcc7a3197beb633ee7d7d1b574a34bf93156 (patch) | |
| tree | 057706635aefce545e0e9046d166dd861e4071b0 /indexer/data_factory.hpp | |
| parent | f3edb952b972d51031371d1c45ce2e8c85e47535 (diff) | |
Remove GeoIndex 2011 format support
Diffstat (limited to 'indexer/data_factory.hpp')
| -rw-r--r-- | indexer/data_factory.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indexer/data_factory.hpp b/indexer/data_factory.hpp index 13ea4e1077..079ed87c83 100644 --- a/indexer/data_factory.hpp +++ b/indexer/data_factory.hpp @@ -2,10 +2,11 @@ #include "indexer/data_header.hpp" #include "indexer/feature_meta.hpp" #include "indexer/interval_index.hpp" -#include "indexer/old/interval_index_101.hpp" #include "platform/mwm_version.hpp" +#include <memory> + class FilesContainerR; class IntervalIndexIFace; @@ -23,10 +24,9 @@ public: inline feature::RegionData const & GetRegionData() const { return m_regionData; } template <typename Reader> - IntervalIndexIFace * CreateIndex(Reader const & reader) const + std::unique_ptr<IntervalIndex<Reader>> CreateIndex(Reader const & reader) const { - if (m_version.GetFormat() == version::Format::v1) - return new old_101::IntervalIndex<uint32_t, Reader>(reader); - return new IntervalIndex<Reader>(reader); + CHECK_NOT_EQUAL(m_version.GetFormat(), version::Format::v1, ("Old maps format is not supported")); + return std::make_unique<IntervalIndex<Reader>>(reader); } }; |