cv::cvflann -> cv::flann

include/opencv/cv.h

@@ -62,10 +62,6 @@
 
 #if defined(__cplusplus)
 #include "opencv2/core/internal.hpp"
-
-namespace cv {
-namespace flann = cvflann;
-}
 #endif //__cplusplus
 
 #endif __OPENCV_OLD_CV_H_

include/opencv/cv.hpp

@@ -43,6 +43,10 @@
 #ifndef __OPENCV_OLD_CV_HPP__
 #define __OPENCV_OLD_CV_HPP__
 
+#if defined(__GNUC__)
+#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+#endif
+
 #include <cv.h>
 
 #endif

include/opencv/cvaux.h

@@ -42,8 +42,9 @@
 #ifndef __OPENCV_OLD_AUX_H__
 #define __OPENCV_OLD_AUX_H__
 
-#pragma warning("This is a deprecated opencv header provided for compatibility. Please \
-include a header from a corresponding opencv module")
+#if defined(__GNUC__)
+#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+#endif
 
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/core.hpp"

include/opencv/cvaux.hpp

@@ -42,6 +42,10 @@
 #ifndef __OPENCV_OLD_AUX_HPP__
 #define __OPENCV_OLD_AUX_HPP__
 
+#if defined(__GNUC__)
+#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+#endif
+
 #include <cvaux.h>
 
 #endif

include/opencv/cxcore.h

@@ -43,6 +43,10 @@
 #ifndef __OPENCV_OLD_CXCORE_H__
 #define __OPENCV_OLD_CXCORE_H__
 
+#if defined(__GNUC__)
+#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
+#endif
+
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/core.hpp"