mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix clashing include guards

Browse Source 
Relevant guards can be found in
ef5579dc86/modules/features2d/src/kaze/AKAZEConfig.h (L8)
and
ef5579dc86/modules/ml/include/opencv2/ml.hpp (L44)
This commit is contained in:
Michał Janiszewski 2018-10-16 21:15:54 +02:00
parent 24ced3d657
commit 85b9960f62
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/traincascade/old_ml.hpp
View File

@ -38,8 +38,8 @@
// //
//M*/ //M*/
#ifndef OPENCV_ML_HPP #ifndef OPENCV_OLD_ML_HPP
#define OPENCV_ML_HPP #define OPENCV_OLD_ML_HPP
#ifdef __cplusplus #ifdef __cplusplus
# include "opencv2/core.hpp" # include "opencv2/core.hpp"
@ -2037,6 +2037,6 @@ template<> void DefaultDeleter<CvDTreeSplit>::operator ()(CvDTreeSplit* obj) con
} }
#endif // __cplusplus #endif // __cplusplus
#endif // OPENCV_ML_HPP #endif // OPENCV_OLD_ML_HPP
/* End of file. */ /* End of file. */

4
modules/features2d/src/kaze/KAZEConfig.h
View File

@ -5,8 +5,8 @@
* @author Pablo F. Alcantarilla * @author Pablo F. Alcantarilla
*/ */
#ifndef __OPENCV_FEATURES_2D_AKAZE_CONFIG_H__ #ifndef __OPENCV_FEATURES_2D_KAZE_CONFIG_H__
#define __OPENCV_FEATURES_2D_AKAZE_CONFIG_H__ #define __OPENCV_FEATURES_2D_KAZE_CONFIG_H__
// OpenCV Includes // OpenCV Includes
#include "../precomp.hpp" #include "../precomp.hpp"