[geos-commits] [SCM] GEOS branch master updated. 66555d08b29d235e07f78a5f1a5e68d756329017
git at osgeo.org
git at osgeo.org
Fri Jul 31 11:30:25 PDT 2020
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 66555d08b29d235e07f78a5f1a5e68d756329017 (commit)
from 831a11e0c791550cef57f240a2b6d666f8f2b6dd (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 66555d08b29d235e07f78a5f1a5e68d756329017
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Fri Jul 31 11:09:24 2020 -0700
Replace forward defns with headers for classes in vector<unique_ptr<>> situations for MSVC
diff --git a/include/geos/operation/overlayng/EdgeNodingBuilder.h b/include/geos/operation/overlayng/EdgeNodingBuilder.h
index 8cc2759..73314ae 100644
--- a/include/geos/operation/overlayng/EdgeNodingBuilder.h
+++ b/include/geos/operation/overlayng/EdgeNodingBuilder.h
@@ -14,32 +14,32 @@
#pragma once
-#include <geos/algorithm/Orientation.h>
#include <geos/algorithm/LineIntersector.h>
-#include <geos/geom/Envelope.h>
+#include <geos/algorithm/Orientation.h>
#include <geos/geom/Coordinate.h>
+#include <geos/geom/CoordinateArraySequence.h>
+#include <geos/geom/CoordinateSequence.h>
+#include <geos/geom/Envelope.h>
#include <geos/geom/Geometry.h>
#include <geos/geom/GeometryCollection.h>
+#include <geos/geom/LinearRing.h>
#include <geos/geom/LineString.h>
#include <geos/geom/MultiLineString.h>
-#include <geos/geom/LinearRing.h>
-#include <geos/geom/Polygon.h>
#include <geos/geom/MultiPolygon.h>
-#include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/CoordinateArraySequence.h>
-#include <geos/noding/ValidatingNoder.h>
-#include <geos/noding/Noder.h>
+#include <geos/geom/Polygon.h>
+#include <geos/noding/IntersectionAdder.h>
#include <geos/noding/MCIndexNoder.h>
-#include <geos/noding/SegmentString.h>
+#include <geos/noding/Noder.h>
#include <geos/noding/NodedSegmentString.h>
-#include <geos/noding/IntersectionAdder.h>
+#include <geos/noding/SegmentString.h>
+#include <geos/noding/ValidatingNoder.h>
#include <geos/noding/snapround/SnapRoundingNoder.h>
#include <geos/operation/overlayng/Edge.h>
-#include <geos/operation/overlayng/RingClipper.h>
-#include <geos/operation/overlayng/LineLimiter.h>
#include <geos/operation/overlayng/EdgeSourceInfo.h>
-#include <geos/operation/overlayng/OverlayUtil.h>
#include <geos/operation/overlayng/InputGeometry.h>
+#include <geos/operation/overlayng/LineLimiter.h>
+#include <geos/operation/overlayng/OverlayUtil.h>
+#include <geos/operation/overlayng/RingClipper.h>
#include <geos/operation/valid/RepeatedPointRemover.h>
diff --git a/include/geos/operation/overlayng/IntersectionPointBuilder.h b/include/geos/operation/overlayng/IntersectionPointBuilder.h
index 61b3792..0502b15 100644
--- a/include/geos/operation/overlayng/IntersectionPointBuilder.h
+++ b/include/geos/operation/overlayng/IntersectionPointBuilder.h
@@ -14,6 +14,8 @@
#pragma once
+#include <geos/geom/Point.h>
+
#include <geos/export.h>
#include <vector>
#include <memory>
@@ -22,7 +24,6 @@
namespace geos {
namespace geom {
class GeometryFactory;
-class Point;
}
namespace operation {
namespace overlayng {
diff --git a/include/geos/operation/overlayng/LineBuilder.h b/include/geos/operation/overlayng/LineBuilder.h
index 5a61800..85ee552 100644
--- a/include/geos/operation/overlayng/LineBuilder.h
+++ b/include/geos/operation/overlayng/LineBuilder.h
@@ -18,6 +18,7 @@
#include <geos/operation/overlayng/InputGeometry.h>
#include <geos/geom/Location.h>
+#include <geos/geom/LineString.h>
#include <vector>
diff --git a/include/geos/operation/overlayng/LineLimiter.h b/include/geos/operation/overlayng/LineLimiter.h
index 41f39bd..54f453c 100644
--- a/include/geos/operation/overlayng/LineLimiter.h
+++ b/include/geos/operation/overlayng/LineLimiter.h
@@ -14,6 +14,8 @@
#pragma once
+#include <geos/geom/CoordinateArraySequence.h>
+
#include <geos/export.h>
#include <array>
#include <memory>
@@ -25,7 +27,6 @@ namespace geom {
class Envelope;
class Coordinate;
class CoordinateSequence;
-class CoordinateArraySequence;
}
}
diff --git a/include/geos/operation/overlayng/MaximalEdgeRing.h b/include/geos/operation/overlayng/MaximalEdgeRing.h
index 995a080..359753e 100644
--- a/include/geos/operation/overlayng/MaximalEdgeRing.h
+++ b/include/geos/operation/overlayng/MaximalEdgeRing.h
@@ -14,6 +14,8 @@
#pragma once
+#include <geos/operation/overlayng/OverlayEdgeRing.h>
+
#include <vector>
#include <memory>
#include <geos/export.h>
@@ -28,7 +30,6 @@ class GeometryFactory;
namespace operation {
namespace overlayng {
class OverlayEdge;
-class OverlayEdgeRing;
class EdgeRing;
}
}
diff --git a/include/geos/operation/overlayng/OverlayGraph.h b/include/geos/operation/overlayng/OverlayGraph.h
index 985b26e..45c4690 100644
--- a/include/geos/operation/overlayng/OverlayGraph.h
+++ b/include/geos/operation/overlayng/OverlayGraph.h
@@ -17,6 +17,7 @@
#include <geos/export.h>
#include <geos/operation/overlayng/OverlayEdge.h>
#include <geos/operation/overlayng/OverlayLabel.h>
+#include <geos/geom/CoordinateSequence.h>
#include <map>
#include <vector>
diff --git a/include/geos/operation/overlayng/OverlayMixedPoints.h b/include/geos/operation/overlayng/OverlayMixedPoints.h
index 8fd5056..c9e6733 100644
--- a/include/geos/operation/overlayng/OverlayMixedPoints.h
+++ b/include/geos/operation/overlayng/OverlayMixedPoints.h
@@ -14,6 +14,11 @@
#pragma once
+
+#include <geos/geom/Point.h>
+#include <geos/geom/Polygon.h>
+#include <geos/geom/LineString.h>
+
#include <geos/export.h>
#include <set>
@@ -27,9 +32,6 @@ namespace geom {
class GeometryFactory;
class PrecisionModel;
class Geometry;
-class Point;
-class Polygon;
-class LineString;
class Coordinate;
class CoordinateArraySequence;
}
diff --git a/include/geos/operation/overlayng/OverlayPoints.h b/include/geos/operation/overlayng/OverlayPoints.h
index da3c7a2..b497ad1 100644
--- a/include/geos/operation/overlayng/OverlayPoints.h
+++ b/include/geos/operation/overlayng/OverlayPoints.h
@@ -17,6 +17,7 @@
#include <geos/export.h>
#include <geos/geom/Geometry.h>
+#include <geos/geom/Point.h>
#include <map>
#include <vector>
@@ -28,7 +29,6 @@ class Coordinate;
class CoordinateSequence;
class GeometryFactory;
class Geometry;
-class Point;
class PrecisionModel;
}
}
diff --git a/include/geos/operation/overlayng/OverlayUtil.h b/include/geos/operation/overlayng/OverlayUtil.h
index 6a92166..58c3595 100644
--- a/include/geos/operation/overlayng/OverlayUtil.h
+++ b/include/geos/operation/overlayng/OverlayUtil.h
@@ -14,6 +14,11 @@
#pragma once
+#include <geos/geom/Point.h>
+#include <geos/geom/Polygon.h>
+#include <geos/geom/LineString.h>
+#include <geos/geom/Geometry.h>
+
#include <geos/export.h>
#include <vector>
@@ -25,11 +30,7 @@ namespace geom {
class Coordinate;
class CoordinateSequence;
class Envelope;
-class Geometry;
class GeometryFactory;
-class LineString;
-class Point;
-class Polygon;
class PrecisionModel;
}
namespace operation {
diff --git a/include/geos/operation/overlayng/PolygonBuilder.h b/include/geos/operation/overlayng/PolygonBuilder.h
index 532c409..9cfda7c 100644
--- a/include/geos/operation/overlayng/PolygonBuilder.h
+++ b/include/geos/operation/overlayng/PolygonBuilder.h
@@ -15,8 +15,11 @@
#pragma once
#include <geos/export.h>
+
+#include <geos/geom/Polygon.h>
#include <geos/operation/overlayng/OverlayEdge.h>
#include <geos/operation/overlayng/OverlayEdgeRing.h>
+#include <geos/operation/overlayng/MaximalEdgeRing.h>
#include <vector>
@@ -31,7 +34,6 @@ class Polygon;
namespace operation {
namespace overlayng {
class Edge;
-class MaximalEdgeRing;
}
}
}
diff --git a/src/operation/overlayng/IntersectionPointBuilder.cpp b/src/operation/overlayng/IntersectionPointBuilder.cpp
index 4914ed2..d1c8484 100644
--- a/src/operation/overlayng/IntersectionPointBuilder.cpp
+++ b/src/operation/overlayng/IntersectionPointBuilder.cpp
@@ -18,7 +18,6 @@
#include <geos/operation/overlayng/OverlayGraph.h>
#include <geos/operation/overlayng/OverlayLabel.h>
#include <geos/geom/GeometryFactory.h>
-#include <geos/geom/Point.h>
diff --git a/src/operation/overlayng/LineBuilder.cpp b/src/operation/overlayng/LineBuilder.cpp
index ec0bd73..1c90ba3 100644
--- a/src/operation/overlayng/LineBuilder.cpp
+++ b/src/operation/overlayng/LineBuilder.cpp
@@ -18,7 +18,6 @@
#include <geos/operation/overlayng/OverlayLabel.h>
#include <geos/operation/overlayng/OverlayNG.h>
#include <geos/geom/GeometryFactory.h>
-#include <geos/geom/LineString.h>
#include <geos/geom/CoordinateArraySequence.h>
#include <geos/geom/CoordinateSequence.h>
diff --git a/src/operation/overlayng/LineLimiter.cpp b/src/operation/overlayng/LineLimiter.cpp
index 332fe3c..3b8eef3 100644
--- a/src/operation/overlayng/LineLimiter.cpp
+++ b/src/operation/overlayng/LineLimiter.cpp
@@ -14,7 +14,6 @@
#include <geos/operation/overlayng/LineLimiter.h>
#include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/CoordinateArraySequence.h>
#include <geos/geom/Envelope.h>
#include <geos/geom/Coordinate.h>
diff --git a/src/operation/overlayng/MaximalEdgeRing.cpp b/src/operation/overlayng/MaximalEdgeRing.cpp
index 6ccf542..b42862c 100644
--- a/src/operation/overlayng/MaximalEdgeRing.cpp
+++ b/src/operation/overlayng/MaximalEdgeRing.cpp
@@ -14,7 +14,6 @@
#include <geos/operation/overlayng/MaximalEdgeRing.h>
#include <geos/operation/overlayng/OverlayEdge.h>
-#include <geos/operation/overlayng/OverlayEdgeRing.h>
#include <geos/geom/Location.h>
#include <geos/geom/Coordinate.h>
#include <geos/geom/CoordinateSequence.h>
diff --git a/src/operation/overlayng/OverlayGraph.cpp b/src/operation/overlayng/OverlayGraph.cpp
index d52f134..b14696b 100644
--- a/src/operation/overlayng/OverlayGraph.cpp
+++ b/src/operation/overlayng/OverlayGraph.cpp
@@ -13,7 +13,7 @@
**********************************************************************/
#include <geos/operation/overlayng/OverlayGraph.h>
-#include <geos/operation/overlayng/OverlayEdge.h>
+
#include <geos/operation/overlayng/Edge.h>
#include <geos/geom/Coordinate.h>
#include <geos/geom/CoordinateSequence.h>
diff --git a/src/operation/overlayng/OverlayMixedPoints.cpp b/src/operation/overlayng/OverlayMixedPoints.cpp
index d9d5847..1b902d1 100644
--- a/src/operation/overlayng/OverlayMixedPoints.cpp
+++ b/src/operation/overlayng/OverlayMixedPoints.cpp
@@ -20,9 +20,6 @@
#include <geos/geom/Coordinate.h>
#include <geos/geom/Geometry.h>
#include <geos/geom/GeometryFactory.h>
-#include <geos/geom/LineString.h>
-#include <geos/geom/Point.h>
-#include <geos/geom/Polygon.h>
#include <geos/geom/PrecisionModel.h>
#include <geos/operation/overlayng/IndexedPointOnLineLocator.h>
#include <geos/operation/overlayng/OverlayEdge.h>
diff --git a/src/operation/overlayng/OverlayPoints.cpp b/src/operation/overlayng/OverlayPoints.cpp
index 440c66d..8c1c1bf 100644
--- a/src/operation/overlayng/OverlayPoints.cpp
+++ b/src/operation/overlayng/OverlayPoints.cpp
@@ -17,7 +17,6 @@
#include <geos/geom/Coordinate.h>
#include <geos/geom/CoordinateSequence.h>
#include <geos/geom/GeometryFactory.h>
-#include <geos/geom/Point.h>
#include <geos/geom/PrecisionModel.h>
#include <geos/operation/overlayng/OverlayNG.h>
#include <geos/operation/overlayng/OverlayUtil.h>
diff --git a/src/operation/overlayng/OverlayUtil.cpp b/src/operation/overlayng/OverlayUtil.cpp
index 8c9918a..80c8d37 100644
--- a/src/operation/overlayng/OverlayUtil.cpp
+++ b/src/operation/overlayng/OverlayUtil.cpp
@@ -16,10 +16,8 @@
#include <geos/operation/overlayng/InputGeometry.h>
#include <geos/operation/overlayng/OverlayGraph.h>
-#include <geos/geom/Point.h>
#include <geos/geom/Coordinate.h>
#include <geos/geom/Envelope.h>
-#include <geos/geom/Geometry.h>
#include <geos/geom/GeometryFactory.h>
#include <geos/geom/PrecisionModel.h>
#include <geos/operation/overlayng/OverlayNG.h>
diff --git a/src/operation/overlayng/PolygonBuilder.cpp b/src/operation/overlayng/PolygonBuilder.cpp
index 5f59963..cfe4d52 100644
--- a/src/operation/overlayng/PolygonBuilder.cpp
+++ b/src/operation/overlayng/PolygonBuilder.cpp
@@ -14,10 +14,8 @@
#include <geos/operation/overlayng/PolygonBuilder.h>
-#include <geos/operation/overlayng/MaximalEdgeRing.h>
#include <geos/operation/overlayng/OverlayLabel.h>
#include <geos/geom/GeometryFactory.h>
-#include <geos/geom/Polygon.h>
#include <geos/util/Assert.h>
#include <geos/util/TopologyException.h>
-----------------------------------------------------------------------
Summary of changes:
.../geos/operation/overlayng/EdgeNodingBuilder.h | 26 +++++++++++-----------
.../operation/overlayng/IntersectionPointBuilder.h | 3 ++-
include/geos/operation/overlayng/LineBuilder.h | 1 +
include/geos/operation/overlayng/LineLimiter.h | 3 ++-
include/geos/operation/overlayng/MaximalEdgeRing.h | 3 ++-
include/geos/operation/overlayng/OverlayGraph.h | 1 +
.../geos/operation/overlayng/OverlayMixedPoints.h | 8 ++++---
include/geos/operation/overlayng/OverlayPoints.h | 2 +-
include/geos/operation/overlayng/OverlayUtil.h | 9 ++++----
include/geos/operation/overlayng/PolygonBuilder.h | 4 +++-
.../overlayng/IntersectionPointBuilder.cpp | 1 -
src/operation/overlayng/LineBuilder.cpp | 1 -
src/operation/overlayng/LineLimiter.cpp | 1 -
src/operation/overlayng/MaximalEdgeRing.cpp | 1 -
src/operation/overlayng/OverlayGraph.cpp | 2 +-
src/operation/overlayng/OverlayMixedPoints.cpp | 3 ---
src/operation/overlayng/OverlayPoints.cpp | 1 -
src/operation/overlayng/OverlayUtil.cpp | 2 --
src/operation/overlayng/PolygonBuilder.cpp | 2 --
19 files changed, 36 insertions(+), 38 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list