mirror of
https://github.com/opencv/opencv.git
synced 2025-06-13 04:52:53 +08:00
Merge pull request #12860 from janisozaur:include-guards
This commit is contained in:
commit
c09a3cf098
@ -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. */
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user