[geos-commits] [SCM] geos branch master updated. 316c4bc51d9d860b67344e48519ef98fd3c28c16

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "geos".

The branch, master has been updated
       via  316c4bc51d9d860b67344e48519ef98fd3c28c16 (commit)
       via  b468a06bb0af4edde4fafec78661c8f3763b9764 (commit)
       via  8d6139637af5263595c768dab91008d143d1db0d (commit)
       via  15346db3c5a5148a6005fa842184d9fffcfeb801 (commit)
      from  07b05035b5e5b6a4e9ce47249aa28b38c668dc8b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 316c4bc51d9d860b67344e48519ef98fd3c28c16
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Sep 16 10:28:41 2017 +0200

    Mark operation::relate::EdgeEndBundle::print as override
    
    as suggested by compiler warning

diff --git a/include/geos/operation/relate/EdgeEndBundle.h b/include/geos/operation/relate/EdgeEndBundle.h
index c1b07fd..490cff3 100644
--- a/include/geos/operation/relate/EdgeEndBundle.h
+++ b/include/geos/operation/relate/EdgeEndBundle.h
@@ -61,7 +61,7 @@ public:
    */
 	void updateIM(geom::IntersectionMatrix& im);
 
-	std::string print() const;
+	std::string print() const override;
 protected:
 	std::vector<geomgraph::EdgeEnd*> *edgeEnds;
 

commit b468a06bb0af4edde4fafec78661c8f3763b9764
Author: nila <n_larsson at yahoo.com>
Date:   Wed May 3 11:43:46 2017 +0200

    Suppress GEOSGeom_createCollection:test1 -Wunnamed-type-template-args warning

diff --git a/tests/unit/capi/GEOSGeom_createCollection.cpp b/tests/unit/capi/GEOSGeom_createCollection.cpp
index ade4aab..d735e44 100644
--- a/tests/unit/capi/GEOSGeom_createCollection.cpp
+++ b/tests/unit/capi/GEOSGeom_createCollection.cpp
@@ -72,7 +72,7 @@ namespace tut
         geoms[2] = GEOSGeom_createEmptyPoint_r(handle_);
         // takes ownership of individual geometries
         geom_ = GEOSGeom_createCollection_r(handle_, GEOS_MULTIPOINT, geoms, geom_size);
-        ensure_equals(GEOSGetNumGeometries_r(handle_, geom_), geom_size);
+        ensure_equals(GEOSGetNumGeometries_r(handle_, geom_), (int)geom_size);
     }
 
 #if (defined(_MSC_VER) && _MSC_VER >= 1600) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__)

commit 8d6139637af5263595c768dab91008d143d1db0d
Author: nila <n_larsson at yahoo.com>
Date:   Wed May 3 11:42:16 2017 +0200

    Supress GeometryFactory::buildGeometry -Wpotentially-evaluated-expression warning

diff --git a/src/geom/GeometryFactory.cpp b/src/geom/GeometryFactory.cpp
index f60025c..896b457 100644
--- a/src/geom/GeometryFactory.cpp
+++ b/src/geom/GeometryFactory.cpp
@@ -723,7 +723,8 @@ GeometryFactory::buildGeometry(const vector<Geometry *> &fromGeoms) const
 	size_t i;
 
 	for (i=0; i<fromGeoms.size(); i++) {
-		string partClass(typeid(*fromGeoms[i]).name());
+		Geometry *geom = fromGeoms[i];
+		string partClass(typeid(*geom).name());
 		if (geomClass=="NULL") {
 			geomClass=partClass;
 		} else if (geomClass!=partClass) {

commit 15346db3c5a5148a6005fa842184d9fffcfeb801
Author: nila <n_larsson at yahoo.com>
Date:   Wed May 3 11:41:43 2017 +0200

    Suppress EdgeEndBundle::print -Woverloaded-virtual warning

diff --git a/include/geos/operation/relate/EdgeEndBundle.h b/include/geos/operation/relate/EdgeEndBundle.h
index eaba734..c1b07fd 100644
--- a/include/geos/operation/relate/EdgeEndBundle.h
+++ b/include/geos/operation/relate/EdgeEndBundle.h
@@ -61,7 +61,7 @@ public:
    */
 	void updateIM(geom::IntersectionMatrix& im);
 
-	std::string print();
+	std::string print() const;
 protected:
 	std::vector<geomgraph::EdgeEnd*> *edgeEnds;
 
diff --git a/src/operation/relate/EdgeEndBundle.cpp b/src/operation/relate/EdgeEndBundle.cpp
index dcf4b4c..06b93ed 100644
--- a/src/operation/relate/EdgeEndBundle.cpp
+++ b/src/operation/relate/EdgeEndBundle.cpp
@@ -161,7 +161,7 @@ void EdgeEndBundle::updateIM(IntersectionMatrix& im) {
 	Edge::updateIM(label, im);
 }
 
-string EdgeEndBundle::print() {
+string EdgeEndBundle::print() const {
 	string out="EdgeEndBundle--> Label: "+label.toString()+"\n";
 	for(vector<EdgeEnd*>::iterator it=edgeEnds->begin();it<edgeEnds->end();it++) {
 		EdgeEnd *e=*it;

-----------------------------------------------------------------------

Summary of changes:
 include/geos/operation/relate/EdgeEndBundle.h |    2 +-
 src/geom/GeometryFactory.cpp                  |    3 ++-
 src/operation/relate/EdgeEndBundle.cpp        |    2 +-
 tests/unit/capi/GEOSGeom_createCollection.cpp |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
geos