[geos-commits] [SCM] GEOS branch master updated. 6fffe8df845837d0c8e56c90d02402dc21e30ecd

[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  6fffe8df845837d0c8e56c90d02402dc21e30ecd (commit)
      from  5ee58d939711a47fa2c34649f788eb988fdece07 (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 6fffe8df845837d0c8e56c90d02402dc21e30ecd
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Nov 24 19:33:53 2020 -0800

    Quiet warnings in CI build

diff --git a/tests/unit/utility.h b/tests/unit/utility.h
index a24c126..7fa2ea2 100644
--- a/tests/unit/utility.h
+++ b/tests/unit/utility.h
@@ -295,21 +295,21 @@ ensure_equals_exact_geometry_xyz(const geos::geom::Geometry *lhs_in,
                   lhs_in->getGeometryTypeId(), rhs_in->getGeometryTypeId());
 
 
-    if (const Point* g = dynamic_cast<const Point *>(lhs_in)) {
-      const Point *g2 = static_cast<const Point *>(rhs_in);
-      return ensure_equals_dims( g->getCoordinatesRO(), g2->getCoordinatesRO(), 3, tolerance);
+    if (const Point* gpt1 = dynamic_cast<const Point *>(lhs_in)) {
+      const Point *gpt2 = static_cast<const Point *>(rhs_in);
+      return ensure_equals_dims( gpt1->getCoordinatesRO(), gpt2->getCoordinatesRO(), 3, tolerance);
     }
-    else if (const LineString* g = dynamic_cast<const LineString *>(lhs_in)) {
-      const LineString *g2 = static_cast<const LineString *>(rhs_in);
-      return ensure_equals_dims( g->getCoordinatesRO(), g2->getCoordinatesRO(), 3, tolerance);
+    else if (const LineString* gln1 = dynamic_cast<const LineString *>(lhs_in)) {
+      const LineString *gln2 = static_cast<const LineString *>(rhs_in);
+      return ensure_equals_dims( gln1->getCoordinatesRO(), gln2->getCoordinatesRO(), 3, tolerance);
     }
     else if (dynamic_cast<const Polygon *>(lhs_in)) {
       assert("Not implemented yet" == 0);
     }
-    else if (const GeometryCollection* g = dynamic_cast<const GeometryCollection *>(lhs_in)) {
-      const GeometryCollection *g2 = static_cast<const GeometryCollection *>(rhs_in);
-      for (unsigned int i = 0; i < g->getNumGeometries(); i++) {
-        ensure_equals_exact_geometry_xyz(g->getGeometryN(i), g2->getGeometryN(i), tolerance);
+    else if (const GeometryCollection* gc1 = dynamic_cast<const GeometryCollection *>(lhs_in)) {
+      const GeometryCollection *gc2 = static_cast<const GeometryCollection *>(rhs_in);
+      for (unsigned int i = 0; i < gc1->getNumGeometries(); i++) {
+        ensure_equals_exact_geometry_xyz(gc1->getGeometryN(i), gc2->getGeometryN(i), tolerance);
       }
     }
 }

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

Summary of changes:
 tests/unit/utility.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GEOS