diff options
| author | Yuri Gorshenin <y@maps.me> | 2015-05-12 13:36:18 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:47:20 +0300 |
| commit | 334bc1a2310ee00ca14aad7fac0aa9c8159d2b49 (patch) | |
| tree | 3ed7b60ef2233018fca04c9d3ba7b5d2d9c36334 /indexer/feature_decl.hpp | |
| parent | ebcbdafa351cc333f958dac2bedd3876d399f95c (diff) | |
Review fixes.
Diffstat (limited to 'indexer/feature_decl.hpp')
| -rw-r--r-- | indexer/feature_decl.hpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indexer/feature_decl.hpp b/indexer/feature_decl.hpp index b847d374a7..157f8d2963 100644 --- a/indexer/feature_decl.hpp +++ b/indexer/feature_decl.hpp @@ -7,7 +7,6 @@ namespace feature { - enum EGeomType { GEOM_UNDEFINED = -1, @@ -16,7 +15,6 @@ enum EGeomType GEOM_LINE = 1, GEOM_AREA = 2 }; - } struct FeatureID @@ -24,12 +22,12 @@ struct FeatureID MwmSet::MwmId m_mwmId; uint32_t m_offset; - FeatureID() = default; + FeatureID() : m_offset(0) {} FeatureID(MwmSet::MwmId const & mwmId, uint32_t offset) : m_mwmId(mwmId), m_offset(offset) {} bool IsValid() const { return m_mwmId.IsAlive(); } - inline bool operator < (FeatureID const & r) const + inline bool operator<(FeatureID const & r) const { if (m_mwmId == r.m_mwmId) return m_offset < r.m_offset; @@ -37,15 +35,12 @@ struct FeatureID return m_mwmId < r.m_mwmId; } - inline bool operator == (FeatureID const & r) const + inline bool operator==(FeatureID const & r) const { return m_mwmId == r.m_mwmId && m_offset == r.m_offset; } - inline bool operator != (FeatureID const & r) const - { - return !(*this == r); - } + inline bool operator!=(FeatureID const & r) const { return !(*this == r); } friend string DebugPrint(FeatureID const & id); }; |