Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00
parent 73c152abc4
commit bd0e0b5800
438 changed files with 20374 additions and 19674 deletions
--- a/modules/flann/src/precomp.hpp
+++ b/modules/flann/src/precomp.hpp
@@ -5,10 +5,6 @@
 #include <cstdarg>
 #include <sstream>

-#ifdef _MSC_VER
-#pragma warning(disable: 4996)
-#endif
-
 #ifdef HAVE_CVCONFIG_H
 # include "cvconfig.h"
 #endif