generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added build warnings in case of macro definition conflicts

Browse Source
This commit is contained in:
Maksim Shabunin
2016-02-25 11:04:23 +03:00
parent ee2f8d006f
commit 3cc234588a
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/utility.hpp
View File

@@ -49,6 +49,10 @@
# error utility.hpp header must be compiled as C++ # error utility.hpp header must be compiled as C++
#endif #endif
#if defined(check)
# warning Detected Apple 'check' macro definition, it can cause build conflicts. Please, include this header before any Apple headers.
#endif
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
namespace cv namespace cv

4
modules/stitching/include/opencv2/stitching/detail/blenders.hpp
View File

@@ -43,6 +43,10 @@
#ifndef __OPENCV_STITCHING_BLENDERS_HPP__ #ifndef __OPENCV_STITCHING_BLENDERS_HPP__
#define __OPENCV_STITCHING_BLENDERS_HPP__ #define __OPENCV_STITCHING_BLENDERS_HPP__
#if defined(NO)
# warning Detected Apple 'NO' macro definition, it can cause build conflicts. Please, include this header before any Apple headers.
#endif
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
namespace cv { namespace cv {

4
modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
View File

@@ -43,6 +43,10 @@
#ifndef __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__ #ifndef __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__
#define __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__ #define __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__
#if defined(NO)
# warning Detected Apple 'NO' macro definition, it can cause build conflicts. Please, include this header before any Apple headers.
#endif
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
namespace cv { namespace cv {