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:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-22 17:25:13 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-22 17:25:13 +0300
commit3d6779f814a59e753ceb5f41b6eb92a203af8c8d (patch)
tree3111f3163984119add4f1c25ccd4f0b78dcda76c /indexer/feature.hpp
parent34ad58798eb1dfa937249d040571aa46256c0863 (diff)
FeatureType bugfix. Initialization of bool fiels of FeatureType class which was uninitialized before.
Diffstat (limited to 'indexer/feature.hpp')
-rw-r--r--indexer/feature.hpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index ad37a1afec..bb86926c2b 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -159,6 +159,9 @@ class FeatureType : public FeatureBase
FeatureID m_id;
public:
+ FeatureType() : m_header2Parsed(false), m_pointsParsed(false),
+ m_trianglesParsed(false), m_metadataParsed(false) {}
+
void Deserialize(feature::LoaderBase * pLoader, TBuffer buffer);
/// @name Editor methods.
@@ -231,14 +234,14 @@ public:
inline size_t GetPointsCount() const
{
- ASSERT(m_bPointsParsed, ());
+ ASSERT(m_pointsParsed, ());
return m_points.size();
}
inline m2::PointD const & GetPoint(size_t i) const
{
ASSERT_LESS(i, m_points.size(), ());
- ASSERT(m_bPointsParsed, ());
+ ASSERT(m_pointsParsed, ());
return m_points[i];
}
@@ -345,7 +348,7 @@ public:
inline void SwapPoints(buffer_vector<m2::PointD, 32> & points) const
{
- ASSERT(m_bPointsParsed, ());
+ ASSERT(m_pointsParsed, ());
return m_points.swap(points);
}
@@ -360,7 +363,10 @@ private:
mutable points_t m_points, m_triangles;
mutable feature::Metadata m_metadata;
- mutable bool m_bHeader2Parsed, m_bPointsParsed, m_bTrianglesParsed, m_bMetadataParsed;
+ mutable bool m_header2Parsed;
+ mutable bool m_pointsParsed;
+ mutable bool m_trianglesParsed;
+ mutable bool m_metadataParsed;
mutable inner_geom_stat_t m_innerStats;