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:
authorvng <viktor.govako@gmail.com>2010-12-11 18:07:48 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:08:33 +0300
commit2dde0d3ee80f91c7e0a5fac53468f7e37fd9a0e3 (patch)
tree9a4bf20db4eabb552d8449358e8638408df6f1e0 /indexer/features_vector.hpp
parented9abd7b505dc4537888c12b29784348c6ed3528 (diff)
Add common definition of FeatureType (current feature class), instead of previous feture_t.
Diffstat (limited to 'indexer/features_vector.hpp')
-rw-r--r--indexer/features_vector.hpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp
index 5aa1d748ad..81d62abdc8 100644
--- a/indexer/features_vector.hpp
+++ b/indexer/features_vector.hpp
@@ -11,8 +11,6 @@
template <typename ReaderT>
class FeaturesVector
{
- typedef FeatureGeom feature_t;
-
public:
typedef ReaderT ReaderType;
@@ -20,7 +18,7 @@ public:
{
}
- void Get(uint64_t pos, feature_t & feature) const
+ void Get(uint64_t pos, FeatureType & feature) const
{
vector<char> record;
uint32_t offset;
@@ -30,14 +28,14 @@ public:
template <class TDo> void ForEachOffset(TDo const & toDo) const
{
- feature_t f;
+ FeatureType f;
m_RecordReader.ForEachRecord(
bind<void>(toDo, bind(&FeaturesVector<ReaderT>::DeserializeFeature, this, _2, _3, &f), _1));
}
template <class TDo> void ForEach(TDo const & toDo) const
{
- feature_t f;
+ FeatureType f;
m_RecordReader.ForEachRecord(
bind<void>(toDo, bind(&FeaturesVector<ReaderT>::DeserializeFeature, this, _2, _3, &f)));
}
@@ -48,7 +46,7 @@ public:
}
private:
- feature_t const & DeserializeFeature(char const * data, uint32_t size, feature_t * pFeature) const
+ FeatureType const & DeserializeFeature(char const * data, uint32_t size, FeatureType * pFeature) const
{
vector<char> data1(data, data + size);
pFeature->Deserialize(data1);