diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2011-05-09 17:07:14 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:17:09 +0300 |
| commit | 9b40c249a804efafa215312a2c9bab315a4884ca (patch) | |
| tree | 291e85f9eb7e0c5b2ba73d7194857dd913586bb9 /indexer/feature_data.hpp | |
| parent | dd660d1fc9c44128d76d0897d665e0cc7eea4270 (diff) | |
compilation fixes.
Diffstat (limited to 'indexer/feature_data.hpp')
| -rw-r--r-- | indexer/feature_data.hpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp index 8686666940..6f6ea53a8d 100644 --- a/indexer/feature_data.hpp +++ b/indexer/feature_data.hpp @@ -2,6 +2,7 @@ #include "../coding/multilang_utf8_string.hpp" #include "../coding/value_opt_string.hpp" +#include "../coding/reader.hpp" #include "../std/string.hpp" #include "../std/vector.hpp" @@ -54,23 +55,23 @@ struct FeatureParamsBase template <class TSink> void Write(TSink & sink, uint8_t header, feature::EGeomType type) const { - if (header & HEADER_HAS_NAME) + if (header & feature::HEADER_HAS_NAME) name.Write(sink); - if (header & HEADER_HAS_LAYER) + if (header & feature::HEADER_HAS_LAYER) WriteToSink(sink, layer); - if (header & HEADER_HAS_ADDINFO) + if (header & feature::HEADER_HAS_ADDINFO) { switch (type) { - case GEOM_POINT: + case feature::GEOM_POINT: WriteToSink(sink, rank); break; - case GEOM_LINE: + case feature::GEOM_LINE: utils::WriteString(sink, ref); break; - case GEOM_AREA: + case feature::GEOM_AREA: house.Write(sink); break; } @@ -80,23 +81,23 @@ struct FeatureParamsBase template <class TSrc> void Read(TSrc & src, uint8_t header, feature::EGeomType type) { - if (header & HEADER_HAS_NAME) + if (header & feature::HEADER_HAS_NAME) name.Read(src); - if (header & HEADER_HAS_LAYER) + if (header & feature::HEADER_HAS_LAYER) layer = ReadPrimitiveFromSource<int8_t>(src); - if (header & HEADER_HAS_ADDINFO) + if (header & feature::HEADER_HAS_ADDINFO) { switch (type) { - case GEOM_POINT: + case feature::GEOM_POINT: rank = ReadPrimitiveFromSource<uint8_t>(src); break; - case GEOM_LINE: + case feature::GEOM_LINE: utils::ReadString(src, ref); break; - case GEOM_AREA: + case feature::GEOM_AREA: house.Read(src); break; } |