[geos-commits] [SCM] GEOS branch master updated. 9de6b71ebf61fb6a474eb37321e9cfd4a23e17e4

[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  9de6b71ebf61fb6a474eb37321e9cfd4a23e17e4 (commit)
      from  bb74b921673fa53b1fea1cdd605ed820a8d48e6c (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 9de6b71ebf61fb6a474eb37321e9cfd4a23e17e4
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Jul 31 14:44:03 2020 -0700

    Make sure there are no forward declarations in templates

diff --git a/include/geos/operation/overlayng/EdgeMerger.h b/include/geos/operation/overlayng/EdgeMerger.h
index 1e44ab4..b9a9458 100644
--- a/include/geos/operation/overlayng/EdgeMerger.h
+++ b/include/geos/operation/overlayng/EdgeMerger.h
@@ -15,6 +15,8 @@
 #pragma once
 
 #include <geos/operation/overlayng/OverlayLabel.h>
+#include <geos/operation/overlayng/EdgeKey.h>
+#include <geos/operation/overlayng/Edge.h>
 #include <geos/export.h>
 
 #include <vector>
diff --git a/include/geos/operation/overlayng/OverlayEdgeRing.h b/include/geos/operation/overlayng/OverlayEdgeRing.h
index 657d223..017a6cc 100644
--- a/include/geos/operation/overlayng/OverlayEdgeRing.h
+++ b/include/geos/operation/overlayng/OverlayEdgeRing.h
@@ -16,6 +16,7 @@
 
 #include <geos/algorithm/locate/IndexedPointInAreaLocator.h>
 #include <geos/geom/CoordinateArraySequence.h>
+#include <geos/geom/LinearRing.h>
 #include <geos/export.h>
 
 // Forward declarations
diff --git a/src/operation/overlayng/EdgeMerger.cpp b/src/operation/overlayng/EdgeMerger.cpp
index e331652..94ee202 100644
--- a/src/operation/overlayng/EdgeMerger.cpp
+++ b/src/operation/overlayng/EdgeMerger.cpp
@@ -13,8 +13,6 @@
  **********************************************************************/
 
 #include <geos/operation/overlayng/EdgeMerger.h>
-#include <geos/operation/overlayng/EdgeKey.h>
-#include <geos/operation/overlayng/Edge.h>
 #include <geos/geom/Dimension.h>
 #include <geos/geom/Coordinate.h>
 #include <geos/geom/CoordinateSequence.h>

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

Summary of changes:
 include/geos/operation/overlayng/EdgeMerger.h      | 2 ++
 include/geos/operation/overlayng/OverlayEdgeRing.h | 1 +
 src/operation/overlayng/EdgeMerger.cpp             | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS