From 4993748c91ef222cd79b05e2c4d8437581b0caef Mon Sep 17 00:00:00 2001
From: Sergiu Dotenco <sergiu.dotenco@gmail.com>
Date: Sun, 19 Aug 2012 15:25:07 +0200
Subject: [PATCH 1/2] added missing includes

---
 modules/calib3d/test/test_affine3d_estimator.cpp | 1 +
 modules/calib3d/test/test_chesscorners.cpp       | 1 +
 modules/gpu/test/precomp.hpp                     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/modules/calib3d/test/test_affine3d_estimator.cpp b/modules/calib3d/test/test_affine3d_estimator.cpp
index 95742a919a..9eed8e97d7 100644
--- a/modules/calib3d/test/test_affine3d_estimator.cpp
+++ b/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>
diff --git a/modules/calib3d/test/test_chesscorners.cpp b/modules/calib3d/test/test_chesscorners.cpp
index f6d513d299..d69212121d 100644
--- a/modules/calib3d/test/test_chesscorners.cpp
+++ b/modules/calib3d/test/test_chesscorners.cpp
@@ -42,6 +42,7 @@
 #include "test_precomp.hpp"
 #include "test_chessboardgenerator.hpp"
 
+#include <functional>
 #include <limits>
 #include <numeric>
 
diff --git a/modules/gpu/test/precomp.hpp b/modules/gpu/test/precomp.hpp
index afc3be8559..5c1c4c1f49 100644
--- a/modules/gpu/test/precomp.hpp
+++ b/modules/gpu/test/precomp.hpp
@@ -51,6 +51,7 @@
 #include <cstdio>
 #include <iostream>
 #include <fstream>
+#include <functional>
 #include <sstream>
 #include <string>
 #include <limits>

From ddc7bd76591d42f264b21f1773a786c241eed576 Mon Sep 17 00:00:00 2001
From: Sergiu Dotenco <sergiu.dotenco@gmail.com>
Date: Sun, 19 Aug 2012 15:30:41 +0200
Subject: [PATCH 2/2] fixed compilation errors caused by std::tuple

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cce10bacd..80cf798ee6 100644
--- a/CMakeLists.txt
+++ b/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)