Merge branch 'sergiud_vs2012rtm_support'

CMakeLists.txt

@@ -336,6 +336,7 @@ include(cmake/OpenCVCompilerOptions.cmake REQUIRED)
 # ----------------------------------------------------------------------------
 if(MSVC)
   include(cmake/OpenCVCRTLinkage.cmake REQUIRED)
+  add_definitions(-D_VARIADIC_MAX=10)
 endif(MSVC)
 
 

modules/calib3d/test/test_affine3d_estimator.cpp

@@ -48,6 +48,7 @@ using namespace std;
 #include <string>
 #include <iostream>
 #include <fstream>
+#include <functional>
 #include <iterator>
 #include <limits>
 #include <numeric>

modules/calib3d/test/test_chesscorners.cpp

@@ -42,6 +42,7 @@
 #include "test_precomp.hpp"
 #include "test_chessboardgenerator.hpp"
 
+#include <functional>
 #include <limits>
 #include <numeric>
 

modules/gpu/test/precomp.hpp

@@ -51,6 +51,7 @@
 #include <cstdio>
 #include <iostream>
 #include <fstream>
+#include <functional>
 #include <sstream>
 #include <string>
 #include <limits>