Fix build warning in vertex iterator

Move away from C style raw memory management. ``` /QGIS-e0de9c5c26c919cbdb3b9ecc3875ad4320d318b4/src/core/geometry/qgsabstractgeometry.cpp: In constructor 'QgsAbstractGeometry::vertex_iterator::vertex_iterator(const QgsAbstractGeometry*, int)': /QGIS-e0de9c5c26c919cbdb3b9ecc3875ad4320d318b4/src/core/geometry/qgsabstractgeometry.cpp:321:44: warning: 'void* memset(void*, int, size_t)' clearing an object of non-trivial type 'struct QgsAbstractGeometry::vertex_iterator::Level'; use assignment or value-initialization instead [-Wclass-memaccess] 321 | ::memset( levels, 0, sizeof( Level ) * 3 ); // make sure we clean up also the padding areas (for memcmp test in operator==) | ^ In file included from /QGIS-e0de9c5c26c919cbdb3b9ecc3875ad4320d318b4/src/core/geometry/qgsabstractgeometry.cpp:17: /QGIS-e0de9c5c26c919cbdb3b9ecc3875ad4320d318b4/src/core/geometry/qgsabstractgeometry.h:852:16: note: 'struct QgsAbstractGeometry::vertex_iterator::Level' declared here 852 | struct Level | ^~~~~ ```
qgis · Aug 8, 2020 · d38acb4 · d38acb4
1 parent 2b3b88c
commit d38acb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/core/geometry/qgsabstractgeometry.cpp b/src/core/geometry/qgsabstractgeometry.cpp
@@ -318,7 +318,7 @@ QgsAbstractGeometry *QgsAbstractGeometry::segmentize( double tolerance, Segmenta
 QgsAbstractGeometry::vertex_iterator::vertex_iterator( const QgsAbstractGeometry *g, int index )
   : depth( 0 )
 {
-  ::memset( levels, 0, sizeof( Level ) * 3 );  // make sure we clean up also the padding areas (for memcmp test in operator==)
+  levels.fill( Level() );
   levels[0].g = g;
   levels[0].index = index;
 
@@ -399,8 +399,7 @@ bool QgsAbstractGeometry::vertex_iterator::operator==( const QgsAbstractGeometry
 {
   if ( depth != other.depth )
     return false;
-  int res = ::memcmp( levels, other.levels, sizeof( Level ) * ( depth + 1 ) );
-  return res == 0;
+  return std::equal( std::begin( levels ), std::begin( levels ) + depth + 1, std::begin( other.levels ) );
 }
 
 void QgsAbstractGeometry::vertex_iterator::digDown()

diff --git a/src/core/geometry/qgsabstractgeometry.h b/src/core/geometry/qgsabstractgeometry.h
@@ -855,8 +855,8 @@ class CORE_EXPORT QgsAbstractGeometry
           int index = 0;               //!< Ptr in the current geometry
         };
 
-        Level levels[3];  //!< Stack of levels - three levels should be sufficient (e.g. part index, ring index, vertex index)
-        int depth = -1;        //!< At what depth level are we right now
+        std::array<Level, 3> levels;  //!< Stack of levels - three levels should be sufficient (e.g. part index, ring index, vertex index)
+        int depth = -1;               //!< At what depth level are we right now
 
         void digDown();   //!< Prepare the stack of levels so that it points to a leaf child geometry