[geos-commits] [SCM] GEOS branch main updated. 6c4b36cc2e58a8d031d46f1c96f35ad84edf5521

git at osgeo.org git at osgeo.org
Thu Sep 23 14:18:50 PDT 2021


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 has been updated
       via  6c4b36cc2e58a8d031d46f1c96f35ad84edf5521 (commit)
      from  896af228fb27076bdd7f0529d55b3e79e3f10191 (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 6c4b36cc2e58a8d031d46f1c96f35ad84edf5521
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Sep 23 14:18:45 2021 -0700

    Fix shadow variable warning, and CI?

diff --git a/util/geosop/GeomFunction.h b/util/geosop/GeomFunction.h
index 6e43dda..944007a 100644
--- a/util/geosop/GeomFunction.h
+++ b/util/geosop/GeomFunction.h
@@ -67,7 +67,7 @@ public:
     static GeomFunction* find(std::string name);
     static std::vector<std::string> list();
 
-    GeomFunction(std::string name,
+    GeomFunction(std::string strName,
                     int nGeom,
                     int nParam,
                     int resType,
@@ -75,7 +75,7 @@ public:
                     std::string desc,
                     geomFunSig fun)
         :
-        funName(name),
+        funName(strName),
         numGeomParam(nGeom),
         numParam(nParam),
         resultType(resType),

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

Summary of changes:
 util/geosop/GeomFunction.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list