[geos-commits] [SCM] GEOS branch main updated. 52f36cb2819010b43deb182e2aa3a7bb3e0a6bbc

[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, main has been updated
       via  52f36cb2819010b43deb182e2aa3a7bb3e0a6bbc (commit)
      from  d7102075476d7034359ac80df9d6612e1e600359 (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 52f36cb2819010b43deb182e2aa3a7bb3e0a6bbc
Author: Daniel Baston <dbaston at gmail.com>
Date:   Fri Nov 8 09:18:48 2024 -0500

    Clustering: Remove old-style header guards

diff --git a/include/geos/operation/cluster/AbstractClusterFinder.h b/include/geos/operation/cluster/AbstractClusterFinder.h
index dfa536248..0b66cd32e 100644
--- a/include/geos/operation/cluster/AbstractClusterFinder.h
+++ b/include/geos/operation/cluster/AbstractClusterFinder.h
@@ -12,10 +12,8 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_ABSTRACTCLUSTERFINDER
-#define GEOS_OPERATION_CLUSTER_ABSTRACTCLUSTERFINDER
+#pragma once
 
-#include <functional>
 #include <memory>
 #include <vector>
 
@@ -132,5 +130,3 @@ private:
 }
 }
 }
-
-#endif
diff --git a/include/geos/operation/cluster/Clusters.h b/include/geos/operation/cluster/Clusters.h
index f4e49619c..82f9d46c3 100644
--- a/include/geos/operation/cluster/Clusters.h
+++ b/include/geos/operation/cluster/Clusters.h
@@ -12,8 +12,7 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_CLUSTERS
-#define GEOS_OPERATION_CLUSTER_CLUSTERS
+#pragma once
 
 #include <geos/export.h>
 #include <limits>
@@ -68,5 +67,3 @@ public:
 }
 }
 }
-
-#endif
diff --git a/include/geos/operation/cluster/DBSCANClusterFinder.h b/include/geos/operation/cluster/DBSCANClusterFinder.h
index dc63f3dfc..be372010e 100644
--- a/include/geos/operation/cluster/DBSCANClusterFinder.h
+++ b/include/geos/operation/cluster/DBSCANClusterFinder.h
@@ -12,8 +12,7 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_DBSCANCLUSTERFINDER
-#define GEOS_OPERATION_CLUSTER_DBSCANCLUSTERFINDER
+#pragma once
 
 #include <geos/operation/cluster/AbstractClusterFinder.h>
 #include <geos/geom/Geometry.h>
@@ -55,5 +54,3 @@ private:
 }
 }
 }
-
-#endif
diff --git a/include/geos/operation/cluster/EnvelopeDistanceClusterFinder.h b/include/geos/operation/cluster/EnvelopeDistanceClusterFinder.h
index f847f0319..eb7dfb25a 100644
--- a/include/geos/operation/cluster/EnvelopeDistanceClusterFinder.h
+++ b/include/geos/operation/cluster/EnvelopeDistanceClusterFinder.h
@@ -12,8 +12,7 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_ENVELOPEDISTANCECLUSTERFINDER
-#define GEOS_OPERATION_CLUSTER_ENVELOPEDISTANCECLUSTERFINDER
+#pragma once
 
 #include <geos/operation/cluster/AbstractClusterFinder.h>
 #include <geos/geom/Envelope.h>
@@ -49,5 +48,3 @@ private:
 }
 }
 }
-
-#endif
diff --git a/include/geos/operation/cluster/EnvelopeIntersectsClusterFinder.h b/include/geos/operation/cluster/EnvelopeIntersectsClusterFinder.h
index 17bb0392d..4f2a7fd8c 100644
--- a/include/geos/operation/cluster/EnvelopeIntersectsClusterFinder.h
+++ b/include/geos/operation/cluster/EnvelopeIntersectsClusterFinder.h
@@ -12,8 +12,7 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_ENVELOPEINTERSECTSCLUSTERFINDER
-#define GEOS_OPERATION_CLUSTER_ENVELOPEINTERSECTSCLUSTERFINDER
+#pragma once
 
 #include <geos/operation/cluster/AbstractClusterFinder.h>
 
@@ -40,5 +39,3 @@ protected:
 }
 }
 }
-
-#endif
\ No newline at end of file
diff --git a/include/geos/operation/cluster/GeometryDistanceClusterFinder.h b/include/geos/operation/cluster/GeometryDistanceClusterFinder.h
index 51645b686..802b9b642 100644
--- a/include/geos/operation/cluster/GeometryDistanceClusterFinder.h
+++ b/include/geos/operation/cluster/GeometryDistanceClusterFinder.h
@@ -12,8 +12,7 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_GEOMETRYDISTANCECLUSTERFINDER
-#define GEOS_OPERATION_CLUSTER_GEOMETRYDISTANCECLUSTERFINDER
+#pragma once
 
 #include <geos/operation/cluster/AbstractClusterFinder.h>
 #include <geos/geom/prep/PreparedGeometry.h>
@@ -55,5 +54,3 @@ private:
 }
 }
 }
-
-#endif
diff --git a/include/geos/operation/cluster/GeometryIntersectsClusterFinder.h b/include/geos/operation/cluster/GeometryIntersectsClusterFinder.h
index 8e4e1a17a..8644e8450 100644
--- a/include/geos/operation/cluster/GeometryIntersectsClusterFinder.h
+++ b/include/geos/operation/cluster/GeometryIntersectsClusterFinder.h
@@ -12,8 +12,7 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_GEOMETRYINTERSECTSCLUSTERFINDER
-#define GEOS_OPERATION_CLUSTER_GEOMETRYINTERSECTSCLUSTERFINDER
+#pragma once
 
 #include <geos/operation/cluster/AbstractClusterFinder.h>
 #include <geos/geom/Geometry.h>
@@ -49,5 +48,3 @@ private:
 }
 }
 }
-
-#endif
diff --git a/include/geos/operation/cluster/UnionFind.h b/include/geos/operation/cluster/UnionFind.h
index 2fe29e1ff..af4715146 100644
--- a/include/geos/operation/cluster/UnionFind.h
+++ b/include/geos/operation/cluster/UnionFind.h
@@ -12,8 +12,7 @@
  *
  **********************************************************************/
 
-#ifndef GEOS_OPERATION_CLUSTER_UNIONFIND
-#define GEOS_OPERATION_CLUSTER_UNIONFIND
+#pragma once
 
 #include <algorithm>
 #include <numeric>
@@ -133,5 +132,3 @@ private:
 }
 }
 }
-
-#endif

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

Summary of changes:
 include/geos/operation/cluster/AbstractClusterFinder.h           | 6 +-----
 include/geos/operation/cluster/Clusters.h                        | 5 +----
 include/geos/operation/cluster/DBSCANClusterFinder.h             | 5 +----
 include/geos/operation/cluster/EnvelopeDistanceClusterFinder.h   | 5 +----
 include/geos/operation/cluster/EnvelopeIntersectsClusterFinder.h | 5 +----
 include/geos/operation/cluster/GeometryDistanceClusterFinder.h   | 5 +----
 include/geos/operation/cluster/GeometryIntersectsClusterFinder.h | 5 +----
 include/geos/operation/cluster/UnionFind.h                       | 5 +----
 8 files changed, 8 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
GEOS