[geos-commits] [SCM] GEOS branch master updated. 98afa17c5d4ccfb860509043289226dd7de4cb27

[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  98afa17c5d4ccfb860509043289226dd7de4cb27 (commit)
      from  067aa6800c4223d708fb729563b6030e16c708d6 (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 98afa17c5d4ccfb860509043289226dd7de4cb27
Author: Andrew Bell <andrew.bell.ia at gmail.com>
Date:   Mon Aug 3 16:51:58 2020 -0400

    Fix windows compilation issues.

diff --git a/include/geos/operation/overlayng/IntersectionPointBuilder.h b/include/geos/operation/overlayng/IntersectionPointBuilder.h
index 0502b15..08b5e09 100644
--- a/include/geos/operation/overlayng/IntersectionPointBuilder.h
+++ b/include/geos/operation/overlayng/IntersectionPointBuilder.h
@@ -87,8 +87,8 @@ public:
 
     std::vector<std::unique_ptr<geom::Point>> getPoints();
 
-
-
+    IntersectionPointBuilder(const IntersectionPointBuilder&) = delete;
+    IntersectionPointBuilder& operator=(const IntersectionPointBuilder&) = delete;
 };
 
 
diff --git a/include/geos/operation/overlayng/LineBuilder.h b/include/geos/operation/overlayng/LineBuilder.h
index 85ee552..c636daa 100644
--- a/include/geos/operation/overlayng/LineBuilder.h
+++ b/include/geos/operation/overlayng/LineBuilder.h
@@ -154,6 +154,8 @@ public:
         , hasResultArea(p_hasResultArea)
         , inputAreaIndex(inputGeom->getAreaIndex()) {}
 
+    LineBuilder(const LineBuilder&) = delete;
+    LineBuilder& operator=(const LineBuilder&) = delete;
 
     std::vector<std::unique_ptr<geom::LineString>> getLines();
 
diff --git a/include/geos/operation/overlayng/OverlayGraph.h b/include/geos/operation/overlayng/OverlayGraph.h
index 8b567bc..e9f8756 100644
--- a/include/geos/operation/overlayng/OverlayGraph.h
+++ b/include/geos/operation/overlayng/OverlayGraph.h
@@ -62,6 +62,7 @@ private:
     // Locally store the OverlayEdge and OverlayLabel
     std::deque<OverlayEdge> ovEdgeQue;
     std::deque<OverlayLabel> ovLabelQue;
+
     std::vector<std::unique_ptr<const geom::CoordinateSequence>> csQue;
 
     // Methods
@@ -89,6 +90,9 @@ public:
     */
     OverlayGraph();
 
+    OverlayGraph(const OverlayGraph& g) = delete;
+    OverlayGraph& operator=(const OverlayGraph& g) = delete;
+
     /**
     * Adds an edge between the coordinates orig and dest
     * to this graph.
diff --git a/include/geos/operation/overlayng/OverlayPoints.h b/include/geos/operation/overlayng/OverlayPoints.h
index b497ad1..87597c8 100644
--- a/include/geos/operation/overlayng/OverlayPoints.h
+++ b/include/geos/operation/overlayng/OverlayPoints.h
@@ -98,6 +98,8 @@ public:
         , pm(p_pm)
         , geometryFactory(p_geom0->getFactory()) {}
 
+    OverlayPoints(const OverlayPoints&) = delete;
+    OverlayPoints& operator=(const OverlayPoints&) = delete;
 
     /**
     * Performs an overlay operation on inputs which are both point geometries.
diff --git a/include/geos/operation/overlayng/PolygonBuilder.h b/include/geos/operation/overlayng/PolygonBuilder.h
index 9cfda7c..d3e363c 100644
--- a/include/geos/operation/overlayng/PolygonBuilder.h
+++ b/include/geos/operation/overlayng/PolygonBuilder.h
@@ -134,6 +134,9 @@ public:
         buildRings(resultAreaEdges);
     }
 
+    PolygonBuilder(const PolygonBuilder&) = delete;
+    PolygonBuilder& operator=(const PolygonBuilder&) = delete;
+
     // Methods
     std::vector<std::unique_ptr<geom::Polygon>> getPolygons();
     std::vector<OverlayEdgeRing*> getShellRings();
diff --git a/src/operation/overlayng/OverlayGraph.cpp b/src/operation/overlayng/OverlayGraph.cpp
index b14696b..d381bcf 100644
--- a/src/operation/overlayng/OverlayGraph.cpp
+++ b/src/operation/overlayng/OverlayGraph.cpp
@@ -89,7 +89,7 @@ OverlayGraph::addEdge(Edge* edge)
 OverlayEdge*
 OverlayGraph::createEdgePair(const CoordinateSequence *pts, OverlayLabel *lbl)
 {
-    csQue.emplace_back(pts);
+    csQue.emplace_back(const_cast<CoordinateSequence *>(pts));
     OverlayEdge* e0 = createOverlayEdge(pts, lbl, true);
     OverlayEdge* e1 = createOverlayEdge(pts, lbl, false);
     e0->link(e1);
diff --git a/tests/xmltester/XMLTester.cpp b/tests/xmltester/XMLTester.cpp
index 8234426..f52fa05 100644
--- a/tests/xmltester/XMLTester.cpp
+++ b/tests/xmltester/XMLTester.cpp
@@ -170,7 +170,7 @@ tolower(std::string& str)
         str.begin(),
         str.end(),
         str.begin(),
-        [](unsigned char c){ return std::tolower(c); }
+        [](char c){ return (char)std::tolower(c); }
         );
 }
 

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

Summary of changes:
 include/geos/operation/overlayng/IntersectionPointBuilder.h | 4 ++--
 include/geos/operation/overlayng/LineBuilder.h              | 2 ++
 include/geos/operation/overlayng/OverlayGraph.h             | 4 ++++
 include/geos/operation/overlayng/OverlayPoints.h            | 2 ++
 include/geos/operation/overlayng/PolygonBuilder.h           | 3 +++
 src/operation/overlayng/OverlayGraph.cpp                    | 2 +-
 tests/xmltester/XMLTester.cpp                               | 2 +-
 7 files changed, 15 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS