[geos-commits] [SCM] GEOS branch main-relate-ng updated. 929c5f20e9e50f25bf63e86e7c88723479769560

[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, main-relate-ng has been updated
       via  929c5f20e9e50f25bf63e86e7c88723479769560 (commit)
      from  80d4b85012032f4891d710ef43f1dfd30baceb11 (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 929c5f20e9e50f25bf63e86e7c88723479769560
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Thu Aug 1 17:16:15 2024 -0700

    Avoid dim param shadowing issues

diff --git a/include/geos/operation/relateng/RelatePredicate.h b/include/geos/operation/relateng/RelatePredicate.h
index 4fc972d85..fc5fc000d 100644
--- a/include/geos/operation/relateng/RelatePredicate.h
+++ b/include/geos/operation/relateng/RelatePredicate.h
@@ -190,8 +190,8 @@ class ContainsPredicate : public IMPredicate {
         return isSourceA == RelateGeometry::GEOM_B;
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         require(isDimsCompatibleWithCovers(dimA, dimB));
     }
 
@@ -251,8 +251,8 @@ class WithinPredicate : public IMPredicate {
         return isSourceA == RelateGeometry::GEOM_A;
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         require(isDimsCompatibleWithCovers(dimB, dimA));
     }
 
@@ -319,8 +319,8 @@ class CoversPredicate : public IMPredicate {
         return isSourceA == RelateGeometry::GEOM_B;
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         require(isDimsCompatibleWithCovers(dimA, dimB));
     }
 
@@ -383,8 +383,8 @@ class CoveredByPredicate : public IMPredicate {
         return isSourceA == RelateGeometry::GEOM_A;
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         require(isDimsCompatibleWithCovers(dimB, dimA));
     }
 
@@ -434,8 +434,8 @@ class CrossesPredicate : public IMPredicate {
         return std::string("crosses");
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         bool isBothPointsOrAreas =
             (dimA == Dimension::P && dimB == Dimension::P) ||
             (dimA == Dimension::A && dimB == Dimension::A);
@@ -490,8 +490,8 @@ class EqualsTopoPredicate : public IMPredicate {
         return std::string("equals");
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         require(dimA == dimB);
     }
 
@@ -543,8 +543,8 @@ class OverlapsPredicate : public IMPredicate {
         return std::string("overlaps");
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         require(dimA == dimB);
     }
 
@@ -602,8 +602,8 @@ class TouchesPredicate : public IMPredicate {
         return std::string("touches");
     }
 
-    void init(int dimA, int dimB) override {
-        IMPredicate::init(dimA, dimB);
+    void init(int _dimA, int _dimB) override {
+        IMPredicate::init(_dimA, _dimB);
         bool isBothPoints = (dimA == 0 && dimB == 0);
         require(! isBothPoints);
     }

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

Summary of changes:
 include/geos/operation/relateng/RelatePredicate.h | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GEOS