[geos-commits] [SCM] GEOS branch master updated. 2a2e67ff4400adc9041e21eb0031c51f8f4d2487

[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  2a2e67ff4400adc9041e21eb0031c51f8f4d2487 (commit)
      from  9cecc5a2e0c757b3739edda19ed2aede42ca4bd7 (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 2a2e67ff4400adc9041e21eb0031c51f8f4d2487
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Aug 11 10:21:47 2020 -0700

    Quiet some MSVC warnings

diff --git a/include/geos/operation/overlayng/IndexedPointOnLineLocator.h b/include/geos/operation/overlayng/IndexedPointOnLineLocator.h
index c646bde..cbe60e5 100644
--- a/include/geos/operation/overlayng/IndexedPointOnLineLocator.h
+++ b/include/geos/operation/overlayng/IndexedPointOnLineLocator.h
@@ -38,7 +38,7 @@ namespace overlayng { // geos.operation.overlayng
  *
  * @author mdavis
  */
-class GEOS_DLL IndexedPointOnLineLocator : public algorithm::locate::PointOnGeometryLocator {
+class IndexedPointOnLineLocator : public algorithm::locate::PointOnGeometryLocator {
 
 private:
 
diff --git a/src/noding/ValidatingNoder.cpp b/src/noding/ValidatingNoder.cpp
index 6d638cd..171878a 100644
--- a/src/noding/ValidatingNoder.cpp
+++ b/src/noding/ValidatingNoder.cpp
@@ -40,7 +40,7 @@ ValidatingNoder::validate()
     try {
         nv.checkValid();
     }
-    catch (const std::exception& ex) {
+    catch (const std::exception &) {
         for (SegmentString* ss: *nodedSS) {
             delete ss;
         }
diff --git a/src/operation/overlayng/OverlayNGSnapIfNeeded.cpp b/src/operation/overlayng/OverlayNGSnapIfNeeded.cpp
index 5fc69e0..c127850 100644
--- a/src/operation/overlayng/OverlayNGSnapIfNeeded.cpp
+++ b/src/operation/overlayng/OverlayNGSnapIfNeeded.cpp
@@ -162,7 +162,7 @@ OverlayNGSnapIfNeeded::overlaySnapping(const Geometry* geom0, const Geometry* ge
     try {
         return overlaySnapTol(geom0, geom1, opCode, snapTol);
     }
-    catch (const geos::util::TopologyException &ex) {
+    catch (const geos::util::TopologyException &) {
         //---- ignore this exception, just return a nullptr result
         // TODO: print a debug message here, beware of leaks
     }
@@ -178,7 +178,7 @@ OverlayNGSnapIfNeeded::overlaySnapBoth(const Geometry* geom0, const Geometry* ge
         std::unique_ptr<Geometry> snap1 = overlaySnapTol(geom1, nullptr, OverlayNG::UNION, snapTol);
         return overlaySnapTol(snap0.get(), snap1.get(), opCode, snapTol);
     }
-    catch (const geos::util::TopologyException &ex) {
+    catch (const geos::util::TopologyException &) {
         //---- ignore this exception, just return a nullptr result
         // TODO: print a debug message here, beware of leaks
     }
@@ -241,7 +241,7 @@ OverlayNGSnapIfNeeded::overlaySR(const Geometry* geom0, const Geometry* geom1, i
         result = OverlayNG::overlay(geom0, geom1, opCode, &PM_FLOAT);
         return result;
     }
-    catch (const geos::util::TopologyException &ex) {
+    catch (const geos::util::TopologyException &) {
         // ignore this exception, since the operation will be rerun
         //System.out.println("Overlay failed");
         // TODO: print debug line, beware of leaks
diff --git a/tests/unit/algorithm/RobustLineIntersectorTest.cpp b/tests/unit/algorithm/RobustLineIntersectorTest.cpp
index 20f0941..3ea2bc1 100644
--- a/tests/unit/algorithm/RobustLineIntersectorTest.cpp
+++ b/tests/unit/algorithm/RobustLineIntersectorTest.cpp
@@ -67,7 +67,7 @@ void object::test<1>
     Coordinate x(15, 15);
     i.computeIntersection(p1, p2, q1, q2);
 
-    ensure_equals(i.getIntersectionNum(), LineIntersector::POINT_INTERSECTION);
+    ensure_equals(i.getIntersectionNum(), (unsigned int)LineIntersector::POINT_INTERSECTION);
     ensure_equals(i.getIntersectionNum(), 1UL);
     ensure_equals(i.getIntersection(0), x);
     ensure("isProper", i.isProper());
diff --git a/tests/unit/operation/overlayng/OverlayNGFloatingNoderTest.cpp b/tests/unit/operation/overlayng/OverlayNGFloatingNoderTest.cpp
index bb07318..c215e5e 100644
--- a/tests/unit/operation/overlayng/OverlayNGFloatingNoderTest.cpp
+++ b/tests/unit/operation/overlayng/OverlayNGFloatingNoderTest.cpp
@@ -62,7 +62,7 @@ struct test_overlayngfloating_data {
                 geomOverlay(a, b, OverlayNG::INTERSECTION);
             return geom_result->getArea();
         }
-        catch (geos::util::TopologyException& ex) {
+        catch (geos::util::TopologyException &) {
             // This exception is expected if the
             // geometries are not perturbed by clipping
         }

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

Summary of changes:
 include/geos/operation/overlayng/IndexedPointOnLineLocator.h  | 2 +-
 src/noding/ValidatingNoder.cpp                                | 2 +-
 src/operation/overlayng/OverlayNGSnapIfNeeded.cpp             | 6 +++---
 tests/unit/algorithm/RobustLineIntersectorTest.cpp            | 2 +-
 tests/unit/operation/overlayng/OverlayNGFloatingNoderTest.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS