Merge pull request #2617 from SunBlack/pragma_once

Replace include guards in all *.h-files by #pragma once
PointCloudLibrary · Nov 28, 2018 · 3917035 · 3917035
2 parents 76689a7 + 9a71865
commit 3917035
Show file tree

Hide file tree

Showing 687 changed files with 807 additions and 2,952 deletions.
diff --git a/2d/include/pcl/2d/convolution.h b/2d/include/pcl/2d/convolution.h
@@ -35,8 +35,7 @@
  *
  */
 
-#ifndef PCL_2D_CONVOLUTION_H
-#define PCL_2D_CONVOLUTION_H
+#pragma once
 
 #include <pcl/pcl_base.h>
 #include <pcl/filters/filter.h>
@@ -156,4 +155,3 @@ POINT_CLOUD_REGISTER_POINT_STRUCT (pcl::PointXYZIEdge,
     (float, magnitude_x, magnitude_x)
     (float, magnitude_y, magnitude_y)
 )
-#endif // PCL_2D_CONVOLUTION_2D_H
diff --git a/2d/include/pcl/2d/edge.h b/2d/include/pcl/2d/edge.h
@@ -35,8 +35,7 @@
  *
  */
 
-#ifndef PCL_2D_EDGE_H
-#define PCL_2D_EDGE_H
+#pragma once
 
 #include <pcl/pcl_base.h>
 #include <pcl/2d/convolution.h>
@@ -303,6 +302,3 @@ namespace pcl
   };
 }
 #include <pcl/2d/impl/edge.hpp>
-
-#endif    // PCL_2D_EDGE_H 
-
diff --git a/2d/include/pcl/2d/kernel.h b/2d/include/pcl/2d/kernel.h
@@ -35,10 +35,11 @@
  *
  */
 
-#ifndef PCL_2D_KERNEL_H_
-#define PCL_2D_KERNEL_H_
+#pragma once
+
 #include <pcl/pcl_base.h>
 #include <pcl/point_types.h>
+
 namespace pcl
 {
   template<typename PointT>
@@ -240,5 +241,3 @@ namespace pcl
 }
 
 #include <pcl/2d/impl/kernel.hpp>
-
-#endif    // PCL_2D_KERNEL_H_
diff --git a/2d/include/pcl/2d/keypoint.h b/2d/include/pcl/2d/keypoint.h
@@ -39,8 +39,7 @@
  *      Author: somani
  */
 
-#ifndef PCL_2D_KEYPOINT_H_
-#define PCL_2D_KEYPOINT_H_
+#pragma once
 
 #include <pcl/2d/edge.h>
 
@@ -71,5 +70,3 @@ namespace pcl
 }
 
 #include <pcl/2d/impl/keypoint.hpp>
-
-#endif    // PCL_2D_KEYPOINT_H_
diff --git a/2d/include/pcl/2d/morphology.h b/2d/include/pcl/2d/morphology.h
@@ -35,8 +35,7 @@
  *
  */
 
-#ifndef PCL_2D_MORPHOLOGY_H_
-#define PCL_2D_MORPHOLOGY_H_
+#pragma once
 
 #include <pcl/pcl_base.h>
 
@@ -196,5 +195,3 @@ namespace pcl
 }
 
 #include <pcl/2d/impl/morphology.hpp>
-
-#endif    // PCL_2D_MORPHOLOGY_H_
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/boost.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/boost.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_BOOST_H
-#define PCL_APPS_IN_HAND_SCANNER_BOOST_H
+#pragma once
 
 #ifdef __GNUC__
 #  pragma GCC system_header
@@ -55,5 +54,3 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/type_traits/is_same.hpp>
-
-#endif // PCL_APPS_IN_HAND_SCANNER_BOOST_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/common_types.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/common_types.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_COMMON_TYPES_H
-#define PCL_APPS_IN_HAND_SCANNER_COMMON_TYPES_H
+#pragma once
 
 #include <stdint.h>
 
@@ -93,5 +92,3 @@ namespace pcl
     typedef Mesh::ConstPtr                           MeshConstPtr;
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_COMMON_TYPES_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/eigen.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/eigen.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_EIGEN_H
-#define PCL_APPS_IN_HAND_SCANNER_EIGEN_H
+#pragma once
 
 #ifdef __GNUC__
 #  pragma GCC system_header
@@ -48,5 +47,3 @@
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 #include <Eigen/Cholesky>
-
-#endif // PCL_APPS_IN_HAND_SCANNER_EIGEN_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/help_window.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/help_window.h
@@ -38,9 +38,7 @@
  *
  */
 
-
-#ifndef PCL_APPS_IN_HAND_SCANNER_HELP_WINDOW_H
-#define PCL_APPS_IN_HAND_SCANNER_HELP_WINDOW_H
+#pragma once
 
 #include <QDialog>
 
@@ -66,5 +64,3 @@ namespace pcl
     };
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_HELP_WINDOW_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/icp.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/icp.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_ICP_H
-#define PCL_APPS_IN_HAND_SCANNER_ICP_H
+#pragma once
 
 #include <pcl/pcl_exports.h>
 #include <pcl/apps/in_hand_scanner/boost.h>
@@ -221,5 +220,3 @@ namespace pcl
     };
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_ICP_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/in_hand_scanner.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/in_hand_scanner.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_IN_HAND_SCANNER_H
-#define PCL_APPS_IN_HAND_SCANNER_IN_HAND_SCANNER_H
+#pragma once
 
 #include <string>
 #include <sstream>
@@ -307,5 +306,3 @@ namespace pcl
 
 // http://doc.qt.digia.com/qt/qmetatype.html#Q_DECLARE_METATYPE
 Q_DECLARE_METATYPE (pcl::ihs::InHandScanner::RunningMode)
-
-#endif // PCL_APPS_IN_HAND_SCANNER_IN_HAND_SCANNER_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/input_data_processing.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/input_data_processing.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_INPUT_DATA_PROCESSING_H
-#define PCL_APPS_IN_HAND_SCANNER_INPUT_DATA_PROCESSING_H
+#pragma once
 
 #include <pcl/pcl_exports.h>
 #include <pcl/apps/in_hand_scanner/eigen.h>
@@ -239,5 +238,3 @@ namespace pcl
     };
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_INPUT_DATA_PROCESSING_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/integration.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/integration.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_INTEGRATION_H
-#define PCL_APPS_IN_HAND_SCANNER_INTEGRATION_H
+#pragma once
 
 #include <stdint.h>
 
@@ -230,5 +229,3 @@ namespace pcl
     };
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_INTEGRATION_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/main_window.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/main_window.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_MAIN_WINDOW_H
-#define PCL_APPS_IN_HAND_SCANNER_MAIN_WINDOW_H
+#pragma once
 
 #include <QMainWindow>
 
@@ -136,5 +135,3 @@ namespace pcl
     };
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_MAIN_WINDOW_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/mesh_processing.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/mesh_processing.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_MESH_PROCESSING_H
-#define PCL_APPS_IN_HAND_SCANNER_MESH_PROCESSING_H
+#pragma once
 
 #include <pcl/apps/in_hand_scanner/common_types.h>
 
@@ -74,5 +73,3 @@ namespace pcl
     };
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_MESH_PROCESSING_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/offline_integration.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/offline_integration.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_OFFLINE_INTEGRATION_H
-#define PCL_APPS_IN_HAND_SCANNER_OFFLINE_INTEGRATION_H
+#pragma once
 
 #include <vector>
 #include <string>
@@ -223,5 +222,3 @@ namespace pcl
     };
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_OFFLINE_INTEGRATION_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/opengl_viewer.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/opengl_viewer.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_OPENGL_VIEWER_H
-#define PCL_APPS_IN_HAND_SCANNER_OPENGL_VIEWER_H
+#pragma once
 
 #include <string>
 
@@ -452,5 +451,3 @@ namespace pcl
 // http://doc.qt.digia.com/qt/qmetatype.html#Q_DECLARE_METATYPE
 Q_DECLARE_METATYPE (pcl::ihs::OpenGLViewer::MeshRepresentation)
 Q_DECLARE_METATYPE (pcl::ihs::OpenGLViewer::Coloring)
-
-#endif // PCL_APPS_IN_HAND_SCANNER_OPENGL_VIEWER_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/utils.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/utils.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_UTILS_H
-#define PCL_APPS_IN_HAND_SCANNER_UTILS_H
+#pragma once
 
 namespace pcl
 {
@@ -53,5 +52,3 @@ namespace pcl
     }
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_UTILS_H
diff --git a/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/visibility_confidence.h b/apps/in_hand_scanner/include/pcl/apps/in_hand_scanner/visibility_confidence.h
@@ -38,8 +38,7 @@
  *
  */
 
-#ifndef PCL_APPS_IN_HAND_SCANNER_VISIBILITY_CONFIDENCE_H
-#define PCL_APPS_IN_HAND_SCANNER_VISIBILITY_CONFIDENCE_H
+#pragma once
 
 #include <stdint.h>
 
@@ -86,5 +85,3 @@ namespace pcl
 
   } // End namespace ihs
 } // End namespace pcl
-
-#endif // PCL_APPS_IN_HAND_SCANNER_VISIBILITY_CONFIDENCE_H
diff --git a/apps/include/pcl/apps/openni_passthrough.h b/apps/include/pcl/apps/openni_passthrough.h
@@ -35,8 +35,7 @@
  *
  */
 
-#ifndef PCL_APPS_OPENNI_PASSTHROUGH_3D_
-#define PCL_APPS_OPENNI_PASSTHROUGH_3D_
+#pragma once
 
 // PCL
 #include <pcl/apps/openni_passthrough_qt.h>
@@ -116,5 +115,3 @@ class OpenNIPassthrough : public QMainWindow
     void 
     valueChanged (int new_value);
 };
-
-#endif    // PCL_APPS_OPENNI_PASSTHROUGH_3D_
diff --git a/apps/include/pcl/apps/openni_passthrough_qt.h b/apps/include/pcl/apps/openni_passthrough_qt.h
@@ -35,8 +35,7 @@
  *
  */
 
-#ifndef PCL_APPS_OPENNI_PASSTHROUGH_QT_
-#define PCL_APPS_OPENNI_PASSTHROUGH_QT_
+#pragma once
 
 #ifdef __GNUC__
 #pragma GCC system_header
@@ -48,5 +47,3 @@
 #include <QMutex>
 #include <QTimer>
 #include <QObject>
-
-#endif    // PCL_APPS_OPENNI_PASSTHROUGH_QT_
diff --git a/apps/include/pcl/apps/organized_segmentation_demo.h b/apps/include/pcl/apps/organized_segmentation_demo.h
@@ -34,8 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PCL_ORGANIZED_SEGMENTATION_DEMO_H_
-#define PCL_ORGANIZED_SEGMENTATION_DEMO_H_
+#pragma once
 
 #include <pcl/apps/organized_segmentation_demo_qt.h>
 
@@ -182,5 +181,3 @@ class OrganizedSegmentationDemo : public QMainWindow
     timeoutSlot();
 
 };
-
-#endif    // PCL_ORGANIZED_SEGMENTATION_DEMO_H_
diff --git a/apps/include/pcl/apps/organized_segmentation_demo_qt.h b/apps/include/pcl/apps/organized_segmentation_demo_qt.h
@@ -34,8 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PCL_ORGANIZED_SEGMENTATION_DEMO_QT_H_
-#define PCL_ORGANIZED_SEGMENTATION_DEMO_QT_H_
+#pragma once
 
 #ifdef __GNUC__
 #pragma GCC system_header
@@ -46,5 +45,3 @@
 #include <QMainWindow>
 #include <QMutex>
 #include <QTimer>
-
-#endif  // PCL_ORGANIZED_SEGMENTATION_DEMO_QT_H_
diff --git a/apps/include/pcl/apps/timer.h b/apps/include/pcl/apps/timer.h
@@ -37,8 +37,7 @@
  *
  */
 
-#ifndef PCL_APPS_TIMER_H_
-#define PCL_APPS_TIMER_H_
+#pragma once
 
 #define MEASURE_FUNCTION_TIME
 #include <pcl/common/time.h> //fps calculations
@@ -64,5 +63,3 @@ do \
 { \
 }while(false)
 #endif
-
-#endif    // PCL_APPS_TIMER_H_