Fixes to make sure each header can be compiled in a standalone way

Verified with ``find include -name "*.h" -exec g++ -c {} -Iinclude -DUSE_UNSTABLE_GEOS_CPP_API \;``
libgeos · Oct 5, 2024 · 325cc64 · 325cc64
1 parent 928feee
commit 325cc64
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 8 deletions.
diff --git a/include/geos/edgegraph/MarkHalfEdge.h b/include/geos/edgegraph/MarkHalfEdge.h
@@ -16,6 +16,7 @@
 #pragma once
 
 #include <geos/geom/Coordinate.h>
+#include <geos/edgegraph/HalfEdge.h>
 
 #include <geos/export.h>
 #include <string>

diff --git a/include/geos/geom/prep/PreparedLineStringDistance.h b/include/geos/geom/prep/PreparedLineStringDistance.h
@@ -21,6 +21,9 @@
 
 namespace geos {
 namespace geom { // geos::geom
+
+class Geometry;
+
 namespace prep { // geos::geom::prep
 
 class PreparedLineString;

diff --git a/include/geos/geom/prep/PreparedLineStringNearestPoints.h b/include/geos/geom/prep/PreparedLineStringNearestPoints.h
@@ -19,8 +19,15 @@
 
 #pragma once
 
+#include <memory>
+
+#include <geos/geom/prep/PreparedLineString.h>
+
 namespace geos {
 namespace geom { // geos::geom
+
+class CoordinateSequence;
+
 namespace prep { // geos::geom::prep
 
 class PreparedLineStringNearestPoints {

diff --git a/include/geos/linearref/LocationIndexedLine.h b/include/geos/linearref/LocationIndexedLine.h
@@ -21,6 +21,7 @@
 #include <geos/export.h>
 #include <geos/geom/Coordinate.h>
 #include <geos/geom/Geometry.h>
+#include <geos/linearref/ExtractLineByLocation.h>
 #include <geos/linearref/LinearLocation.h>
 #include <geos/linearref/LocationIndexOfPoint.h>
 #include <geos/linearref/LocationIndexOfLine.h>

diff --git a/include/geos/operation/relateng/EdgeSetIntersector.h b/include/geos/operation/relateng/EdgeSetIntersector.h
@@ -43,6 +43,7 @@ using geos::geom::Envelope;
 using geos::geom::Geometry;
 using geos::index::strtree::TemplateSTRtree;
 using geos::index::chain::MonotoneChain;
+using geos::noding::SegmentString;
 using geos::operation::relateng::EdgeSegmentIntersector;
 
 

diff --git a/include/geos/operation/union/CascadedPolygonUnion.h b/include/geos/operation/union/CascadedPolygonUnion.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include <geos/export.h>
 
 #include <geos/operation/union/UnionStrategy.h>

diff --git a/include/geos/operation/union/PointGeometryUnion.h b/include/geos/operation/union/PointGeometryUnion.h
@@ -22,6 +22,7 @@
 
 #include <vector>
 #include <algorithm>
+#include <memory>
 
 // Forward declarations
 namespace geos {

diff --git a/include/geos/triangulate/polygon/PolygonHoleJoiner.h b/include/geos/triangulate/polygon/PolygonHoleJoiner.h
@@ -31,6 +31,7 @@ namespace geom {
 class Envelope;
 class Geometry;
 class LinearRing;
+class Polygon;
 }
 namespace noding {
 }

diff --git a/include/geos/triangulate/polygon/PolygonNoder.h b/include/geos/triangulate/polygon/PolygonNoder.h
@@ -18,7 +18,11 @@
 // #include <geos/geom/Coordinate.h>
 //#include <geos/geom/CoordinateSequence.h>
 
+#include <geos/export.h>
+
 #include <map>
+#include <memory>
+#include <vector>
 
 // Forward declarations
 namespace geos {
@@ -29,6 +33,9 @@ class CoordinateSequence;
 namespace noding {
 class NodedSegmentString;
 }
+namespace algorithm {
+class LineIntersector;
+}
 }
 
 using geos::geom::Coordinate;

diff --git a/include/geos/triangulate/tri/TriEdge.h b/include/geos/triangulate/tri/TriEdge.h
@@ -15,16 +15,9 @@
 #pragma once
 
 #include <geos/export.h>
+#include <geos/geom/Coordinate.h>
 #include <iostream>
 
-
-// Forward declarations
-namespace geos {
-namespace geom {
-class Coordinate;
-}
-}
-
 using geos::geom::Coordinate;
 
 namespace geos {        // geos.