Merge pull request #12860 from janisozaur:include-guards

This commit is contained in:
Alexander Alekhin 2018-10-17 08:20:31 +00:00
commit c09a3cf098
2 changed files with 5 additions and 5 deletions

View File

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

View File

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