Header guard cleanup (making sure naming is compliant with C++ standa…

…rds and consistent).
TadasBaltrusaitis · TadasBaltrusaitis · Sep 24, 2018 · Sep 20, 2018 · Sep 20, 2018 · Sep 20, 2018
commit dafddd60280d6a2fad8ea9ae54f307369186d112
diff --git a/lib/local/CppInerop/FaceAnalyserInterop.h b/lib/local/CppInerop/FaceAnalyserInterop.h
@@ -33,8 +33,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // FaceAnalyser_Interop.h
-#ifndef __FACE_ANALYSER_INTEROP_h_
-#define __FACE_ANALYSER_INTEROP_h_
+#ifndef FACE_ANALYSER_INTEROP_H
+#define FACE_ANALYSER_INTEROP_H
 
 #pragma once
 
@@ -306,4 +306,4 @@ public ref class FaceAnalyserManaged
 };
 }
 
-#endif
+#endif // FACE_ANALYSER_INTEROP_H
diff --git a/lib/local/CppInerop/FaceDetectorInterop.h b/lib/local/CppInerop/FaceDetectorInterop.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LANDMARK_DETECTOR_UTILS_INTEROP_h_
-#define __LANDMARK_DETECTOR_UTILS_INTEROP_h_
+#ifndef FACE_DETECTOR_INTEROP_H
+#define FACE_DETECTOR_INTEROP_H
 
 #pragma once
 
@@ -163,4 +163,4 @@ namespace FaceDetectorInterop {
 
 }
 
-#endif
+#endif // FACE_DETECTOR_INTEROP_H
diff --git a/lib/local/CppInerop/GazeAnalyserInterop.h b/lib/local/CppInerop/GazeAnalyserInterop.h
@@ -33,9 +33,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-// FaceAnalyser_Interop.h
-#ifndef __GAZE_ANALYSER_INTEROP_h_
-#define __GAZE_ANALYSER_INTEROP_h_
+#ifndef GAZE_ANALYSER_INTEROP_H
+#define GAZE_ANALYSER_INTEROP_H
 
 #pragma once
 
@@ -211,4 +210,4 @@ namespace GazeAnalyser_Interop {
 	};
 }
 
-#endif
+#endif // GAZE_ANALYSER_INTEROP_H
diff --git a/lib/local/CppInerop/LandmarkDetectorInterop.h b/lib/local/CppInerop/LandmarkDetectorInterop.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LANDMARK_DETECTOR_INTEROP_h_
-#define __LANDMARK_DETECTOR_INTEROP_h_
+#ifndef LANDMARK_DETECTOR_INTEROP_H
+#define LANDMARK_DETECTOR_INTEROP_H
 
 #pragma once
 
@@ -450,4 +450,4 @@ namespace CppInterop {
 
 }
 
-#endif
+#endif // LANDMARK_DETECTOR_INTEROP_H
diff --git a/lib/local/CppInerop/RecorderInterop.h b/lib/local/CppInerop/RecorderInterop.h
@@ -31,8 +31,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-// Camera_Interop.h
-
 #pragma once
 
 #pragma unmanaged

diff --git a/lib/local/FaceAnalyser/include/FaceAnalyser.h b/lib/local/FaceAnalyser/include/FaceAnalyser.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __FACEANALYSER_h_
-#define __FACEANALYSER_h_
+#ifndef FACEANALYSER_H
+#define FACEANALYSER_H
 
 // STL includes
 #include <string>
@@ -242,4 +242,4 @@ class FaceAnalyser{
 };
   //===========================================================================
 }
-#endif
+#endif // FACEANALYSER_H
diff --git a/lib/local/FaceAnalyser/include/FaceAnalyserParameters.h b/lib/local/FaceAnalyser/include/FaceAnalyserParameters.h
@@ -33,8 +33,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 //  Parameters of the Face analyser
-#ifndef __FACE_ANALYSER_PARAM_H
-#define __FACE_ANALYSER_PARAM_H
+#ifndef FACE_ANALYSER_PARAM_H
+#define FACE_ANALYSER_PARAM_H
 
 #include <vector>
 #include <opencv2/core/core.hpp>
@@ -101,4 +101,4 @@ struct FaceAnalyserParameters
 
 }
 
-#endif // __FACE_ANALYSER_PARAM_H
+#endif // FACE_ANALYSER_PARAM_H
diff --git a/lib/local/FaceAnalyser/include/Face_utils.h b/lib/local/FaceAnalyser/include/Face_utils.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __FACE_UTILS_h_
-#define __FACE_UTILS_h_
+#ifndef FACE_UTILS_H
+#define FACE_UTILS_H
 
 #include <opencv2/core/core.hpp>
 #include <opencv2/highgui/highgui.hpp>
@@ -70,4 +70,4 @@ namespace FaceAnalysis
 	void SkipComments(std::ifstream& stream);
 
 }
-#endif
+#endif // FACE_UTILS_H
diff --git a/lib/local/FaceAnalyser/include/SVM_dynamic_lin.h b/lib/local/FaceAnalyser/include/SVM_dynamic_lin.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SVMDYNAMICLIN_h_
-#define __SVMDYNAMICLIN_h_
+#ifndef SVM_DYNAMIC_LIN_H
+#define SVM_DYNAMIC_LIN_H
 
 #include <vector>
 #include <string>
@@ -84,4 +84,4 @@ class SVM_dynamic_lin{
 };
   //===========================================================================
 }
-#endif
+#endif // SVM_DYNAMIC_LIN_H
diff --git a/lib/local/FaceAnalyser/include/SVM_static_lin.h b/lib/local/FaceAnalyser/include/SVM_static_lin.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SVMSTATICLIN_h_
-#define __SVMSTATICLIN_h_
+#ifndef SVM_STATIC_LIN_H
+#define SVM_STATIC_LIN_H
 
 #include <vector>
 #include <string>
@@ -84,4 +84,4 @@ class SVM_static_lin{
 };
   //===========================================================================
 }
-#endif
+#endif // SVM_STATIC_LIN_H
diff --git a/lib/local/FaceAnalyser/include/SVR_dynamic_lin_regressors.h b/lib/local/FaceAnalyser/include/SVR_dynamic_lin_regressors.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SVRDYNAMICLINREGRESSORS_h_
-#define __SVRDYNAMICLINREGRESSORS_h_
+#ifndef SVR_DYNAMIC_LIN_REGRESSORS_H
+#define SVR_DYNAMIC_LIN_REGRESSORS_H
 
 #include <vector>
 #include <string>
@@ -89,4 +89,4 @@ class SVR_dynamic_lin_regressors{
 };
   //===========================================================================
 }
-#endif
+#endif // SVR_DYNAMIC_LIN_REGRESSORS_H
diff --git a/lib/local/FaceAnalyser/include/SVR_static_lin_regressors.h b/lib/local/FaceAnalyser/include/SVR_static_lin_regressors.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SVRSTATICLINREGRESSORS_h_
-#define __SVRSTATICLINREGRESSORS_h_
+#ifndef SVR_STATIC_LIN_REGRESSORS_H
+#define SVR_STATIC_LIN_REGRESSORS_H
 
 #include <vector>
 #include <string>
@@ -81,4 +81,4 @@ class SVR_static_lin_regressors{
 };
   //===========================================================================
 }
-#endif
+#endif // SVR_STATIC_LIN_REGRESSORS_H
diff --git a/lib/local/GazeAnalyser/include/GazeEstimation.h b/lib/local/GazeAnalyser/include/GazeEstimation.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GAZEESTIMATION_h_
-#define __GAZEESTIMATION_h_
+#ifndef GAZE_ESTIMATION_H
+#define GAZE_ESTIMATION_H
 
 #include "LandmarkDetectorModel.h"
 
@@ -51,4 +51,4 @@ namespace GazeAnalysis
 	cv::Point3f GetPupilPosition(cv::Mat_<float> eyeLdmks3d);
 
 }
-#endif
+#endif // GAZE_ESTIMATION_H
diff --git a/lib/local/LandmarkDetector/include/CCNF_patch_expert.h b/lib/local/LandmarkDetector/include/CCNF_patch_expert.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __CCNF_PATCH_EXPERT_h_
-#define __CCNF_PATCH_EXPERT_h_
+#ifndef CCNF_PATCH_EXPERT_H
+#define CCNF_PATCH_EXPERT_H
 
 #include <opencv2/core/core.hpp>
 
@@ -126,4 +126,4 @@ class CCNF_patch_expert{
 };
   //===========================================================================
 }
-#endif
+#endif // CCNF_PATCH_EXPERT_H
diff --git a/lib/local/LandmarkDetector/include/CEN_patch_expert.h b/lib/local/LandmarkDetector/include/CEN_patch_expert.h
@@ -33,8 +33,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef __CEN_PATCH_EXPERT_h_
-#define __CEN_PATCH_EXPERT_h_
+#ifndef CEN_PATCH_EXPERT_H
+#define CEN_PATCH_EXPERT_H
 
 // system includes
 #include <vector>
@@ -88,4 +88,4 @@ namespace LandmarkDetector
 	void interpolationMatrix(cv::Mat_<float>& mapMatrix, int response_height, int response_width, int input_width, int input_height);
 
 }
-#endif
+#endif // CEN_PATCH_EXPERT_H
diff --git a/lib/local/LandmarkDetector/include/CNN_utils.h b/lib/local/LandmarkDetector/include/CNN_utils.h
@@ -31,9 +31,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-//  Header for all external CLNF/CLM-Z/CLM methods of interest to the user
-#ifndef __CNN_UTILS_h_
-#define __CNN_UTILS_h_
+#ifndef CNN_UTILS_H
+#define CNN_UTILS_H
 
 // OpenCV includes
 #include <opencv2/core/core.hpp>
@@ -60,4 +59,4 @@ namespace LandmarkDetector
 	// Convolution using matrix multiplication and OpenBLAS optimization, can also provide a pre-allocated im2col result for faster processing
 	void convolution_direct_blas(std::vector<cv::Mat_<float> >& outputs, const std::vector<cv::Mat_<float> >& input_maps, const cv::Mat_<float>& weight_matrix, int height_k, int width_k, cv::Mat_<float>& pre_alloc_im2col);
 }
-#endif
+#endif // CNN_UTILS_H
diff --git a/lib/local/LandmarkDetector/include/FaceDetectorMTCNN.h b/lib/local/LandmarkDetector/include/FaceDetectorMTCNN.h
@@ -31,8 +31,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __FACE_DETECTOR_MTCNN_h_
-#define __FACE_DETECTOR_MTCNN_h_
+#ifndef FACE_DETECTOR_MTCNN_H
+#define FACE_DETECTOR_MTCNN_H
 
 // OpenCV includes
 #include <opencv2/core/core.hpp>
@@ -132,4 +132,4 @@ namespace LandmarkDetector
 	};
 
 }
-#endif
+#endif // FACE_DETECTOR_MTCNN_H
diff --git a/lib/local/LandmarkDetector/include/LandmarkCoreIncludes.h b/lib/local/LandmarkDetector/include/LandmarkCoreIncludes.h
@@ -33,12 +33,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef __LANDMARK_CORE_INCLUDES_h_
-#define __LANDMARK_CORE_INCLUDES_h_
+#ifndef LANDMARK_CORE_INCLUDES_H
+#define LANDMARK_CORE_INCLUDES_H
 
 #include "LandmarkDetectorModel.h"
 #include "LandmarkDetectorFunc.h"
 #include "LandmarkDetectorParameters.h"
 #include "LandmarkDetectorUtils.h"
 
-#endif
+#endif // LANDMARK_CORE_INCLUDES_H
diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectionValidator.h b/lib/local/LandmarkDetector/include/LandmarkDetectionValidator.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LANDMARK_DETECTION_VALIDATOR_h_
-#define __LANDMARK_DETECTION_VALIDATOR_h_
+#ifndef LANDMARK_DETECTION_VALIDATOR_H
+#define LANDMARK_DETECTION_VALIDATOR_H
 
 // OpenCV includes
 #include <opencv2/core/core.hpp>
@@ -114,4 +114,4 @@ class DetectionValidator
 };
 
 }
-#endif
+#endif // LANDMARK_DETECTION_VALIDATOR_H
diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h b/lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h
@@ -32,11 +32,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-//  Header for all external CLM/CLNF/CLM-Z methods of interest to the user
+//  Header for all external CLM/CLNF/CE-CLM methods of interest to the user
 //
 //
-#ifndef __LANDMARK_DETECTOR_FUNC_h_
-#define __LANDMARK_DETECTOR_FUNC_h_
+#ifndef LANDMARK_DETECTOR_FUNC_H
+#define LANDMARK_DETECTOR_FUNC_H
 
 // OpenCV includes
 #include <opencv2/core/core.hpp>
@@ -78,4 +78,4 @@ namespace LandmarkDetector
 	// The format returned is [Tx, Ty, Tz, Eul_x, Eul_y, Eul_z]
 	cv::Vec6f GetPoseWRTCamera(const CLNF& clnf_model, float fx, float fy, float cx, float cy);
 }
-#endif
+#endif // LANDMARK_DETECTOR_FUNC_H
diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectorModel.h b/lib/local/LandmarkDetector/include/LandmarkDetectorModel.h
@@ -32,8 +32,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LANDMARK_DETECTOR_MODEL_h_
-#define __LANDMARK_DETECTOR_MODEL_h_
+#ifndef LANDMARK_DETECTOR_MODEL_H
+#define LANDMARK_DETECTOR_MODEL_H
 
 // OpenCV dependencies
 #include <opencv2/core/core.hpp>
@@ -209,4 +209,4 @@ class CLNF{
   };
   //===========================================================================
 }
-#endif
+#endif // LANDMARK_DETECTOR_MODEL_H
diff --git a/lib/local/LandmarkDetector/include/LandmarkDetectorParameters.h b/lib/local/LandmarkDetector/include/LandmarkDetectorParameters.h
@@ -32,9 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-//  Parameters of the CLNF, CLM-Z and CLM trackers
-#ifndef __LANDMARK_DETECTOR_PARAM_H
-#define __LANDMARK_DETECTOR_PARAM_H
+//  Parameters of the CE-CLM, CLNF, and CLM trackers
+#ifndef LANDMARK_DETECTOR_PARAM_H
+#define LANDMARK_DETECTOR_PARAM_H
 
 #include <vector>
 
@@ -120,4 +120,4 @@ struct FaceModelParameters
 
 }
 
-#endif // __LANDMARK_DETECTOR_PARAM_H
+#endif // LANDMARK_DETECTOR_PARAM_H