From c06e600a8862d1ca16b872c3ea3c953aa2248ceb Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Tue, 30 Jul 2024 09:38:44 -0400 Subject: [PATCH] Remove remaining old-style header guards --- src/box.h | 5 +---- src/cell.h | 5 +---- src/coordinate.h | 5 +---- src/crossing.h | 5 +---- src/floodfill.h | 5 +---- src/geos_utils.h | 5 +---- src/grid.h | 5 +---- src/matrix.h | 5 +---- src/measures.h | 5 +---- src/output_writer.h | 5 +---- src/perimeter_distance.h | 5 +---- src/raster_cell_intersection.h | 5 +---- src/raster_sequential_processor.h | 5 +---- src/raster_source.h | 5 +---- src/side.h | 5 +---- src/traversal.h | 5 +---- src/traversal_areas.h | 5 +---- src/variance.h | 5 +---- src/weighted_quantiles.h | 5 +---- 19 files changed, 19 insertions(+), 76 deletions(-) diff --git a/src/box.h b/src/box.h index 31ea32cc..03b38f98 100644 --- a/src/box.h +++ b/src/box.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_BOX_H -#define EXACTEXTRACT_BOX_H +#pragma once #include "coordinate.h" #include "crossing.h" @@ -174,5 +173,3 @@ std::ostream& operator<<(std::ostream& os, const Box& c); } - -#endif diff --git a/src/cell.h b/src/cell.h index 5402cc30..022f77fb 100644 --- a/src/cell.h +++ b/src/cell.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_CELL_H -#define EXACTEXTRACT_CELL_H +#pragma once #include "box.h" #include "coordinate.h" @@ -105,5 +104,3 @@ class Cell }; } - -#endif diff --git a/src/coordinate.h b/src/coordinate.h index 5fb2a318..a976c2d6 100644 --- a/src/coordinate.h +++ b/src/coordinate.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_COORDINATE_H -#define EXACTEXTRACT_COORDINATE_H +#pragma once #include #include @@ -59,5 +58,3 @@ std::ostream& operator<<(std::ostream& os, const Coordinate& c); } - -#endif \ No newline at end of file diff --git a/src/crossing.h b/src/crossing.h index 1e868a51..6e017edc 100644 --- a/src/crossing.h +++ b/src/crossing.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_CELL_CROSSING_H -#define EXACTEXTRACT_CELL_CROSSING_H +#pragma once #include "coordinate.h" #include "side.h" @@ -50,5 +49,3 @@ class Crossing }; } - -#endif \ No newline at end of file diff --git a/src/floodfill.h b/src/floodfill.h index 6a557bf7..b1008ac7 100644 --- a/src/floodfill.h +++ b/src/floodfill.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_FLOODFILL_H -#define EXACTEXTRACT_FLOODFILL_H +#pragma once #include @@ -136,5 +135,3 @@ FloodFill::flood(Matrix& arr) const } } - -#endif \ No newline at end of file diff --git a/src/geos_utils.h b/src/geos_utils.h index f41c04f1..825eb05c 100644 --- a/src/geos_utils.h +++ b/src/geos_utils.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_GEOS_UTILS_H -#define EXACTEXTRACT_GEOS_UTILS_H +#pragma once #include #include @@ -131,5 +130,3 @@ seq_ptr_r to_coordseq(GEOSContextHandle_t context, const std::vector& coords); } - -#endif // RASTER_OVERLAY_CPP_GEOS_UTILS_H diff --git a/src/grid.h b/src/grid.h index df971ee2..5085606d 100644 --- a/src/grid.h +++ b/src/grid.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_GRID_H -#define EXACTEXTRACT_GRID_H +#pragma once #include #include @@ -386,5 +385,3 @@ common_grid(T begin, T end) } } - -#endif // EXACTEXTRACT_INFINITEGRID_H diff --git a/src/matrix.h b/src/matrix.h index 7273583c..6a87334d 100644 --- a/src/matrix.h +++ b/src/matrix.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_MATRIX_H -#define EXACTEXTRACT_MATRIX_H +#pragma once #include #include @@ -155,5 +154,3 @@ operator<<(std::ostream& os, const Matrix& m) } } - -#endif diff --git a/src/measures.h b/src/measures.h index 33110b8a..bf959b6c 100644 --- a/src/measures.h +++ b/src/measures.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_MEASURES_H -#define EXACTEXTRACT_MEASURES_H +#pragma once #include @@ -43,5 +42,3 @@ double length(const std::vector& coords); } - -#endif diff --git a/src/output_writer.h b/src/output_writer.h index 7b6fcc08..fcd0b74f 100644 --- a/src/output_writer.h +++ b/src/output_writer.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_OUTPUT_WRITER_H -#define EXACTEXTRACT_OUTPUT_WRITER_H +#pragma once #include "feature.h" @@ -51,5 +50,3 @@ class OutputWriter }; } - -#endif // EXACTEXTRACT_OUTPUT_WRITER_H diff --git a/src/perimeter_distance.h b/src/perimeter_distance.h index 6c36d064..ee7e435f 100644 --- a/src/perimeter_distance.h +++ b/src/perimeter_distance.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_PERIMETERDISTANCE_H -#define EXACTEXTRACT_PERIMETERDISTANCE_H +#pragma once #include "box.h" #include "coordinate.h" @@ -32,5 +31,3 @@ double perimeter_distance_ccw(double measure1, double measure2, double perimeter); } - -#endif \ No newline at end of file diff --git a/src/raster_cell_intersection.h b/src/raster_cell_intersection.h index ca1039f0..427e87a4 100644 --- a/src/raster_cell_intersection.h +++ b/src/raster_cell_intersection.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_RASTER_CELL_INTERSECTION_H -#define EXACTEXTRACT_RASTER_CELL_INTERSECTION_H +#pragma once #include @@ -111,5 +110,3 @@ Box processing_region(const Box& raster_extent, const std::vector& component_boxes); } - -#endif diff --git a/src/raster_sequential_processor.h b/src/raster_sequential_processor.h index b5c24f80..becb6152 100644 --- a/src/raster_sequential_processor.h +++ b/src/raster_sequential_processor.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_RASTER_SEQUENTIAL_PROCESSOR_H -#define EXACTEXTRACT_RASTER_SEQUENTIAL_PROCESSOR_H +#pragma once #include "geos_utils.h" #include "map_feature.h" @@ -42,5 +41,3 @@ class RasterSequentialProcessor : public Processor }; } - -#endif // EXACTEXTRACT_RASTER_SEQUENTIAL_PROCESSOR_H diff --git a/src/raster_source.h b/src/raster_source.h index 6aa5d349..26095c7b 100644 --- a/src/raster_source.h +++ b/src/raster_source.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_RASTER_SOURCE_H -#define EXACTEXTRACT_RASTER_SOURCE_H +#pragma once #include "box.h" #include "grid.h" @@ -51,5 +50,3 @@ class RasterSource mutable std::unique_ptr m_empty; }; } - -#endif // EXACTEXTRACT_RASTER_SOURCE_H diff --git a/src/side.h b/src/side.h index f6dd19ac..f62c20f6 100644 --- a/src/side.h +++ b/src/side.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_SIDE_H -#define EXACTEXTRACT_SIDE_H +#pragma once #include @@ -31,5 +30,3 @@ std::ostream& operator<<(std::ostream& os, const Side& s); } - -#endif diff --git a/src/traversal.h b/src/traversal.h index 3c7351ed..04a4d0cb 100644 --- a/src/traversal.h +++ b/src/traversal.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_TRAVERSAL_H -#define EXACTEXTRACT_TRAVERSAL_H +#pragma once #include @@ -74,5 +73,3 @@ class Traversal }; } - -#endif diff --git a/src/traversal_areas.h b/src/traversal_areas.h index 7a115227..5c0a05ae 100644 --- a/src/traversal_areas.h +++ b/src/traversal_areas.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_TRAVERSAL_AREAS_H -#define EXACTEXTRACT_TRAVERSAL_AREAS_H +#pragma once #include @@ -51,5 +50,3 @@ geom_ptr_r left_hand_rings(GEOSContextHandle_t context, const Box& box, const std::vector*>& coord_lists); } - -#endif diff --git a/src/variance.h b/src/variance.h index 914d7787..6ec309cd 100644 --- a/src/variance.h +++ b/src/variance.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_VARIANCE_H -#define EXACTEXTRACT_VARIANCE_H +#pragma once #include @@ -73,5 +72,3 @@ class WestVariance }; } - -#endif // EXACTEXTRACT_VARIANCE_H diff --git a/src/weighted_quantiles.h b/src/weighted_quantiles.h index 6a36ee25..a1b8dd74 100644 --- a/src/weighted_quantiles.h +++ b/src/weighted_quantiles.h @@ -11,8 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef EXACTEXTRACT_WEIGHTED_QUANTILES_H -#define EXACTEXTRACT_WEIGHTED_QUANTILES_H +#pragma once #include #include @@ -67,5 +66,3 @@ class WeightedQuantiles }; } - -#endif // EXACTEXTRACT_WEIGHTED_QUANTILES_H