[geos-commits] [SCM] GEOS branch master updated. 1d69445459c3642a3c235a853548df3023f8ee7a

[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  1d69445459c3642a3c235a853548df3023f8ee7a (commit)
      from  34918fd50f8cb42c75a5a16c9e6d9f315068d1f8 (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 1d69445459c3642a3c235a853548df3023f8ee7a
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Mar 9 14:23:51 2021 -0500

    Fix from dbaston.  Closes https://github.com/libgeos/geos/pull/426  Closes #1104

diff --git a/util/geosop/GeosOp.cpp b/util/geosop/GeosOp.cpp
index 144b5fe..c1bc0f5 100644
--- a/util/geosop/GeosOp.cpp
+++ b/util/geosop/GeosOp.cpp
@@ -143,7 +143,8 @@ GeosOp::GeosOp(GeosOpArgs& arg)
 GeosOp::~GeosOp() {
 }
 
-std::string formatNum(long n)
+template<typename T>
+std::string formatNum(T n)
 {
     auto fmt = std::to_string(n);
     // use signed num to allow negative to indicate done
@@ -168,7 +169,7 @@ bool isWKTLiteral(std::string s) {
     if (endsWith(s, " EMPTY")) return true;
 
     // assume if string contains a ( it is WKT
-    long numLParen = std::count(s.begin(), s.end(), '(');
+    auto numLParen = std::count(s.begin(), s.end(), '(');
     return numLParen > 0;
 }
 
diff --git a/util/geosop/GeosOp.h b/util/geosop/GeosOp.h
index 1aea4fa..b67200a 100644
--- a/util/geosop/GeosOp.h
+++ b/util/geosop/GeosOp.h
@@ -62,7 +62,7 @@ private:
     GeosOpArgs& args;
 
     long opCount = 0;
-    long vertexCount = 0;
+    std::size_t vertexCount = 0;
     double totalTime = 0;
 
     std::vector<std::unique_ptr<Geometry>> geomA;

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

Summary of changes:
 util/geosop/GeosOp.cpp | 5 +++--
 util/geosop/GeosOp.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS