Use pragma once instead of name macro

cvg · Dec 14, 2024 · 61ce224 · 61ce224
1 parent 2373f14
commit 61ce224
Show file tree

Hide file tree

Showing 65 changed files with 65 additions and 261 deletions.
diff --git a/limap/base/camera.h b/limap/base/camera.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_CAMERA_H_
-#define LIMAP_BASE_CAMERA_H_
+#pragma once
 
 #include <cmath>
 #include <fstream>
@@ -114,5 +113,3 @@ class CameraPose {
 };
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/camera_models.h b/limap/base/camera_models.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_CAMERA_MODELS_H_
-#define LIMAP_BASE_CAMERA_MODELS_H_
+#pragma once
 
 #include <colmap/sensor/models.h>
 
@@ -45,5 +44,3 @@ void ParamsToKvec(const colmap::CameraModelId model_id, const T *params,
 }
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/camera_view.h b/limap/base/camera_view.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_CAMERA_VIEW_H_
-#define LIMAP_BASE_CAMERA_VIEW_H_
+#pragma once
 
 #include <cmath>
 #include <fstream>
@@ -89,5 +88,3 @@ class CameraView : public CameraImage {
 };
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/graph.h b/limap/base/graph.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_GRAPH_H_
-#define LIMAP_BASE_GRAPH_H_
+#pragma once
 
 #include <algorithm>
 #include <chrono>
@@ -97,5 +96,3 @@ CountTrackEdges(const Graph &graph, const std::vector<size_t> &track_labels,
                 const std::vector<bool> is_root);
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/image_collection.h b/limap/base/image_collection.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_IMAGE_COLLECTION_H_
-#define LIMAP_BASE_IMAGE_COLLECTION_H_
+#pragma once
 
 #include <cmath>
 #include <fstream>
@@ -115,5 +114,3 @@ class ImageCollection {
 };
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/infinite_line.h b/limap/base/infinite_line.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_INFINITE_LINE_H_
-#define LIMAP_BASE_INFINITE_LINE_H_
+#pragma once
 
 #include "_limap/helpers.h"
 #include <pybind11/numpy.h>
@@ -86,5 +85,3 @@ Line3d GetLineSegmentFromInfiniteLine3d(const InfiniteLine3d &inf_line,
                                         const int num_outliers = 2);
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/line_dists.h b/limap/base/line_dists.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_LINE_DISTS_H_
-#define LIMAP_BASE_LINE_DISTS_H_
+#pragma once
 
 #include <cmath>
 #include <pybind11/eigen.h>
@@ -221,5 +220,3 @@ double infinite_dist_perpendicular_scaleinv_line3dpp(const Line3d &l1,
                                                      const Line3d &l2);
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/line_linker.h b/limap/base/line_linker.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_LINE_LINKER_H_
-#define LIMAP_BASE_LINE_LINKER_H_
+#pragma once
 
 #include "_limap/helpers.h"
 #include <pybind11/numpy.h>
@@ -228,5 +227,3 @@ class LineLinker {
 };
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/linebase.h b/limap/base/linebase.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_LINEBASE_H_
-#define LIMAP_BASE_LINEBASE_H_
+#pragma once
 
 #include <cmath>
 #include <pybind11/eigen.h>
@@ -69,5 +68,3 @@ Line3d unprojection_line2d(const Line2d &line2d, const CameraView &view,
                            const std::pair<double, double> &depths);
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/linetrack.h b/limap/base/linetrack.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_LINETRACK_H_
-#define LIMAP_BASE_LINETRACK_H_
+#pragma once
 
 #include <cmath>
 #include <map>
@@ -82,5 +81,3 @@ void ComputeFConsistencySamples(
     const std::pair<double, double> sample_range, const int n_samples);
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/pointtrack.h b/limap/base/pointtrack.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_POINTTRACK_H_
-#define LIMAP_BASE_POINTTRACK_H_
+#pragma once
 
 #include <cmath>
 #include <map>
@@ -53,5 +52,3 @@ class PointTrack {
 };
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/pose.h b/limap/base/pose.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_POSE_H_
-#define LIMAP_BASE_POSE_H_
+#pragma once
 
 #include <colmap/geometry/pose.h>
 
@@ -30,5 +29,3 @@ Eigen::Matrix3d QuaternionToRotationMatrix(const Eigen::Vector4d &qvec);
 Eigen::Vector4d NormalizeQuaternion(const Eigen::Vector4d &qvec);
 
 } // namespace limap
-
-#endif
diff --git a/limap/base/transforms.h b/limap/base/transforms.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_BASE_TRANSFORMS_H_
-#define LIMAP_BASE_TRANSFORMS_H_
+#pragma once
 
 #include "base/camera.h"
 #include "base/pose.h"
@@ -30,5 +29,3 @@ CameraPose pose_similarity_transform(const CameraPose &pose,
                                      const SimilarityTransform3 &transform);
 
 } // namespace limap
-
-#endif
diff --git a/limap/ceresbase/ceres_extensions.h b/limap/ceresbase/ceres_extensions.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_CERESBASE_CERES_EXTENSIONS_H
-#define LIMAP_CERESBASE_CERES_EXTENSIONS_H
+#pragma once
 
 // Modified from the pixel-perfect-sfm project
 
@@ -49,5 +48,3 @@ inline void AssignSolverOptionsFromDict(ceres::Solver::Options &solver_options,
   ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, inner_iteration_tolerance,
                                double)
 }
-
-#endif
diff --git a/limap/ceresbase/interpolation.h b/limap/ceresbase/interpolation.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_CERESBASE_INTERPOLATION_H
-#define LIMAP_CERESBASE_INTERPOLATION_H
+#pragma once
 
 // Modified from the pixel-perfect-sfm project
 // [LINK] https://github.com/cvg/pixel-perfect-sfm
@@ -745,5 +744,3 @@ template <typename Grid> class PixelInterpolator : public Interpolator<Grid> {
 };
 
 } // namespace limap
-
-#endif
diff --git a/limap/ceresbase/line_dists.h b/limap/ceresbase/line_dists.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_CERESBASE_LINE_DISTS_H
-#define LIMAP_CERESBASE_LINE_DISTS_H
+#pragma once
 
 #include <ceres/ceres.h>
 #include <ceres/rotation.h>
@@ -88,5 +87,3 @@ T CeresComputeDist3D_angle(const T dir1[3], const T dir2[3]) {
 }
 
 } // namespace limap
-
-#endif
diff --git a/limap/ceresbase/line_projection.h b/limap/ceresbase/line_projection.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_CERESBASE_LINE_PROJECTION_H
-#define LIMAP_CERESBASE_LINE_PROJECTION_H
+#pragma once
 
 #include "ceresbase/line_transforms.h"
 #include "ceresbase/point_projection.h"
@@ -214,5 +213,3 @@ bool Ceres_GetIntersection2dFromInfiniteLine3d(
 }
 
 } // namespace limap
-
-#endif
diff --git a/limap/ceresbase/line_transforms.h b/limap/ceresbase/line_transforms.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_CERESBASE_LINE_TRANSFORMS_H
-#define LIMAP_CERESBASE_LINE_TRANSFORMS_H
+#pragma once
 
 #include <ceres/ceres.h>
 #include <ceres/rotation.h>
@@ -73,5 +72,3 @@ bool Ceres_IntersectLineCoordinates(const T coor1[3], const T coor2[3],
 }
 
 } // namespace limap
-
-#endif
diff --git a/limap/ceresbase/loss_functions.h b/limap/ceresbase/loss_functions.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_CERESBASE_LOSS_FUNCTIONS_H
-#define LIMAP_CERESBASE_LOSS_FUNCTIONS_H
+#pragma once
 
 // Modified from the pixel-perfect-sfm project.
 
@@ -249,5 +248,3 @@ inline ceres::LossFunction *CreateLossFunction(py::dict dict) {
 }
 
 } // namespace limap
-
-#endif
diff --git a/limap/ceresbase/parameterization.h b/limap/ceresbase/parameterization.h
@@ -1,7 +1,4 @@
-#ifndef LIMAP_CERESBASE_PARAMETERIZATION_H
-#define LIMAP_CERESBASE_PARAMETERIZATION_H
-
-// Inspired by COLMAP: https://colmap.github.io/
+#pragma once
 
 #include <ceres/ceres.h>
 #include <ceres/rotation.h>
@@ -38,5 +35,3 @@ inline void SetSphereManifold(ceres::Problem *problem, double *params) {
 }
 
 } // namespace limap
-
-#endif
diff --git a/limap/ceresbase/point_projection.h b/limap/ceresbase/point_projection.h
@@ -1,7 +1,4 @@
-#ifndef LIMAP_CERESBASE_POINT_PROJECTION_H
-#define LIMAP_CERESBASE_POINT_PROJECTION_H
-
-// Modified from the pixel-perfect-sfm project
+#pragma once
 
 #include <ceres/ceres.h>
 #include <ceres/rotation.h>
@@ -64,5 +61,3 @@ template <typename T> inline bool IsInsideZeroL(const T &value, double L) {
 }
 
 } // namespace limap
-
-#endif
diff --git a/limap/estimators/absolute_pose/hybrid_pose_estimator.h b/limap/estimators/absolute_pose/hybrid_pose_estimator.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_ESTIMATORS_POSE_HYBRID_POSE_ESTIMATOR_H_
-#define LIMAP_ESTIMATORS_POSE_HYBRID_POSE_ESTIMATOR_H_
+#pragma once
 
 #include "_limap/helpers.h"
 #include "base/camera.h"
@@ -139,5 +138,3 @@ EstimateAbsolutePose_PointLine_Hybrid(
 } // namespace estimators
 
 } // namespace limap
-
-#endif
diff --git a/limap/estimators/absolute_pose/joint_pose_estimator.h b/limap/estimators/absolute_pose/joint_pose_estimator.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_ESTIMATORS_POSE_JOINT_POSE_ESTIMATOR_H_
-#define LIMAP_ESTIMATORS_POSE_JOINT_POSE_ESTIMATOR_H_
+#pragma once
 
 #include "_limap/helpers.h"
 #include "base/camera.h"
@@ -105,5 +104,3 @@ EstimateAbsolutePose_PointLine(const std::vector<Line3d> &l3ds,
 } // namespace estimators
 
 } // namespace limap
-
-#endif
diff --git a/limap/estimators/absolute_pose/pl_absolute_pose_hybrid_ransac.h b/limap/estimators/absolute_pose/pl_absolute_pose_hybrid_ransac.h
@@ -28,8 +28,7 @@
 //
 // author: Torsten Sattler, [email protected]
 
-#ifndef LIMAP_ESTIMATORS_POSE_PL_ABSOLUTE_POSE_HYBRID_RANSAC_H_
-#define LIMAP_ESTIMATORS_POSE_PL_ABSOLUTE_POSE_HYBRID_RANSAC_H_
+#pragma once
 
 #include <algorithm>
 #include <cmath>
@@ -622,5 +621,3 @@ class PointLineAbsolutePoseHybridRansac : public HybridRansacBase {
 } // namespace estimators
 
 } // namespace limap
-
-#endif
diff --git a/limap/estimators/absolute_pose/pl_absolute_pose_ransac.h b/limap/estimators/absolute_pose/pl_absolute_pose_ransac.h
@@ -1,4 +1,3 @@
-// Copyright (c) 2019, Torsten Sattler
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -28,8 +27,7 @@
 //
 // author: Torsten Sattler, [email protected]
 
-#ifndef LIMAP_ESTIMATORS_POSE_PL_ABSOLUTE_POSE_RANSAC_H_
-#define LIMAP_ESTIMATORS_POSE_PL_ABSOLUTE_POSE_RANSAC_H_
+#pragma once
 
 #include <algorithm>
 #include <cmath>
@@ -457,5 +455,3 @@ class PointLineAbsolutePoseRansac : public RansacBase {
 } // namespace estimators
 
 } // namespace limap
-
-#endif
diff --git a/limap/estimators/extended_hybrid_ransac.h b/limap/estimators/extended_hybrid_ransac.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_ESTIMATORS_EXTENDED_HYBRID_RANSAC_H_
-#define LIMAP_ESTIMATORS_EXTENDED_HYBRID_RANSAC_H_
+#pragma once
 
 #include <RansacLib/hybrid_ransac.h>
 
@@ -18,5 +17,3 @@ class ExtendedHybridLORansacOptions : public ransac_lib::HybridLORansacOptions {
 } // namespace estimators
 
 } // namespace limap
-
-#endif
diff --git a/limap/evaluation/base_evaluator.h b/limap/evaluation/base_evaluator.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_EVALUATION_BASE_EVALUATOR_H_
-#define LIMAP_EVALUATION_BASE_EVALUATOR_H_
+#pragma once
 
 #include "base/linebase.h"
 #include "util/types.h"
@@ -37,5 +36,3 @@ class BaseEvaluator {
 } // namespace evaluation
 
 } // namespace limap
-
-#endif
diff --git a/limap/evaluation/mesh_evaluator.h b/limap/evaluation/mesh_evaluator.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_EVALUATION_MESH_EVALUATOR_H_
-#define LIMAP_EVALUATION_MESH_EVALUATOR_H_
+#pragma once
 
 #include "base/linebase.h"
 #include "evaluation/base_evaluator.h"
@@ -30,5 +29,3 @@ class MeshEvaluator : public BaseEvaluator {
 } // namespace evaluation
 
 } // namespace limap
-
-#endif
diff --git a/limap/evaluation/point_cloud_evaluator.h b/limap/evaluation/point_cloud_evaluator.h
@@ -1,5 +1,4 @@
-#ifndef LIMAP_EVALUATION_POINT_CLOUD_EVALUATOR_H_
-#define LIMAP_EVALUATION_POINT_CLOUD_EVALUATOR_H_
+#pragma once
 
 #include "base/linebase.h"
 #include "evaluation/base_evaluator.h"
@@ -47,5 +46,3 @@ class PointCloudEvaluator : public BaseEvaluator {
 } // namespace evaluation
 
 } // namespace limap
-
-#endif