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>2019-03-18 14:03:17 +0300
committermpimenov <mpimenov@users.noreply.github.com>2019-03-18 22:38:39 +0300
commit939620a534af3d58288c4734fa99f3a85f4b587e (patch)
tree76df5692ecbf2089a693d953c2cb539f539b7fcf /indexer
parent67af75dc5b6daec3e784725b7e6ce68d3ae54735 (diff)
Review fixes.
Diffstat (limited to 'indexer')
-rw-r--r--indexer/feature.cpp2
-rw-r--r--indexer/features_vector.cpp2
-rw-r--r--indexer/features_vector.hpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 6cc25b7501..bc298a399d 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -189,7 +189,7 @@ FeatureType::FeatureType(SharedLoadInfo const * loadInfo, Buffer buffer)
m_offsets.Reset();
m_ptsSimpMask = 0;
- m_limitRect = m2::RectD::GetEmptyRect();
+ m_limitRect.MakeEmpty();
m_parsed.Reset();
m_innerStats.MakeZero();
}
diff --git a/indexer/features_vector.cpp b/indexer/features_vector.cpp
index e7f6e96ce5..646b17850e 100644
--- a/indexer/features_vector.cpp
+++ b/indexer/features_vector.cpp
@@ -10,7 +10,7 @@ std::unique_ptr<FeatureType> FeaturesVector::GetByIndex(uint32_t index) const
uint32_t offset = 0, size = 0;
auto const ftOffset = m_table ? m_table->GetFeatureOffset(index) : index;
m_recordReader.ReadRecord(ftOffset, m_buffer, offset, size);
- return make_unique<FeatureType>(&m_loadInfo, &m_buffer[offset]);
+ return std::make_unique<FeatureType>(&m_loadInfo, &m_buffer[offset]);
}
size_t FeaturesVector::GetNumFeatures() const
diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp
index 14811f0bbe..e0750f79e5 100644
--- a/indexer/features_vector.hpp
+++ b/indexer/features_vector.hpp
@@ -5,7 +5,9 @@
#include "coding/var_record_reader.hpp"
+#include <cstdint>
#include <memory>
+#include <vector>
namespace feature { class FeaturesOffsetsTable; }
@@ -55,7 +57,7 @@ private:
feature::SharedLoadInfo m_loadInfo;
VarRecordReader<FilesContainerR::TReader, &VarRecordSizeReaderVarint> m_recordReader;
- mutable vector<char> m_buffer;
+ mutable std::vector<char> m_buffer;
feature::FeaturesOffsetsTable const * m_table;
};