suppress MSVC warnings about std::vector and std::copy

git-svn-id: https://code.ros.org/svn/opencv/trunk@2040 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 0834953f6d58bc0abee5c665f0794518cb3aae97..cbe1298095b2e76f656949523ae41d1cb3da5c08 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -490,7 +490,7 @@ set(EXTRA_EXE_LINKER_FLAGS_RELEASE "")
 set(EXTRA_EXE_LINKER_FLAGS_DEBUG "")
 
 if(MSVC)
-    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE")
+    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _SCL_SECURE_NO_WARNINGS")
     # 64-bit portability warnings, in MSVC8
     if(MSVC80)
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /Wp64")

diff --git a/opencv/src/cv/_cv.h b/opencv/src/cv/_cv.h
index 8dafec6763bda50b55f0e9da4204b5c5af89bfa5..93c7d8c5d43f7868d407d9a3649c01bac3c0848d 100644 (file)
--- a/opencv/src/cv/_cv.h
+++ b/opencv/src/cv/_cv.h
@@ -45,7 +45,7 @@
 \r
 #if defined _MSC_VER && _MSC_VER >= 1200\r
     /* disable warnings related to inline functions */\r
-    #pragma warning( disable: 4711 4710 4514 )\r
+    #pragma warning( disable: 4251 4711 4710 4514 )\r
 #endif\r
 \r
 #include "cv.h"\r

diff --git a/opencv/src/cvaux/_cvaux.h b/opencv/src/cvaux/_cvaux.h
index 65267d922b0fc2bb39d603d94f96791620e72fde..548e335bbbab70e48303915f0302be195869f9fb 100644 (file)
--- a/opencv/src/cvaux/_cvaux.h
+++ b/opencv/src/cvaux/_cvaux.h
@@ -42,7 +42,7 @@
 #define __CVAUX_H__
 
 #if _MSC_VER >= 1200
-#pragma warning( disable: 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
+#pragma warning( disable: 4251 4710 4711 4514 4996 ) /* function AAA selected for automatic inline expansion */
 #endif
 
 #include "cvaux.h"

diff --git a/opencv/src/cxcore/_cxcore.h b/opencv/src/cxcore/_cxcore.h
index fad07e46880f383e4d093fcabe812d10f0d1101d..e1fbf12e3ef97e9adbd714af7304e9a3bdefbab1 100644 (file)
--- a/opencv/src/cxcore/_cxcore.h
+++ b/opencv/src/cxcore/_cxcore.h
@@ -45,7 +45,7 @@
 
 #if defined _MSC_VER && _MSC_VER >= 1200
     /* disable warnings related to inline functions */
-    #pragma warning( disable: 4711 4710 4514 )
+    #pragma warning( disable: 4251 4711 4710 4514 )
 #endif
 
 typedef unsigned long ulong;