[geos-commits] r4361 - trunk/src/geom/util

Mateusz Loskot mateusz at loskot.net
Tue Mar 21 04:53:10 PDT 2017


Author: mloskot
Date: 2017-03-21 04:53:10 -0700 (Tue, 21 Mar 2017)
New Revision: 4361

Modified:
   trunk/src/geom/util/GeometryEditor.cpp
   trunk/src/geom/util/GeometryTransformer.cpp
   trunk/src/geom/util/ShortCircuitedGeometryVisitor.cpp
Log:
Fix warning about signed/unsigned int mismatch.

Modified: trunk/src/geom/util/GeometryEditor.cpp
===================================================================
--- trunk/src/geom/util/GeometryEditor.cpp	2017-03-21 11:23:03 UTC (rev 4360)
+++ trunk/src/geom/util/GeometryEditor.cpp	2017-03-21 11:53:10 UTC (rev 4361)
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.osgeo.org
@@ -155,7 +155,7 @@
 {
 	GeometryCollection *newCollection = dynamic_cast<GeometryCollection*>( operation->edit(collection,factory) );
 	vector<Geometry*> *geometries = new vector<Geometry*>();
-	for (unsigned int i=0, n=newCollection->getNumGeometries(); i<n; i++)
+	for (std::size_t i=0, n=newCollection->getNumGeometries(); i<n; i++)
 	{
 		Geometry *geometry = edit(newCollection->getGeometryN(i),
 			operation);

Modified: trunk/src/geom/util/GeometryTransformer.cpp
===================================================================
--- trunk/src/geom/util/GeometryTransformer.cpp	2017-03-21 11:23:03 UTC (rev 4360)
+++ trunk/src/geom/util/GeometryTransformer.cpp	2017-03-21 11:53:10 UTC (rev 4361)
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.osgeo.org
@@ -335,7 +335,7 @@
 
 	auto_ptr< vector<Geometry*> > transGeomList( new vector<Geometry*>() );
 
-	for (unsigned int i=0, n=geom->getNumGeometries(); i<n; i++)
+	for (std::size_t i=0, n=geom->getNumGeometries(); i<n; i++)
 	{
 		const Polygon* p = dynamic_cast<const Polygon*>(
 				geom->getGeometryN(i));
@@ -366,7 +366,7 @@
 
 	vector<Geometry*>* transGeomList = new vector<Geometry*>();
 
-	for (unsigned int i=0, n=geom->getNumGeometries(); i<n; i++)
+	for (std::size_t i=0, n=geom->getNumGeometries(); i<n; i++)
 	{
 		Geometry::AutoPtr transformGeom = transform(
 			geom->getGeometryN(i)); // no parent ?

Modified: trunk/src/geom/util/ShortCircuitedGeometryVisitor.cpp
===================================================================
--- trunk/src/geom/util/ShortCircuitedGeometryVisitor.cpp	2017-03-21 11:23:03 UTC (rev 4360)
+++ trunk/src/geom/util/ShortCircuitedGeometryVisitor.cpp	2017-03-21 11:53:10 UTC (rev 4361)
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.osgeo.org
@@ -30,7 +30,7 @@
 void
 ShortCircuitedGeometryVisitor::applyTo(const Geometry &geom)
 {
-	for (unsigned int i=0, n=geom.getNumGeometries(); i<n; ++i)
+	for (std::size_t i=0, n=geom.getNumGeometries(); i<n; ++i)
 	{
 		const Geometry *element = geom.getGeometryN(i);
 		if (dynamic_cast<const GeometryCollection*>(element))



More information about the geos-commits mailing list