ts: fix missing std::tr1 (C++17)

f1e50eca · Alexander Alekhin · Alexander Alekhin · a0ce12f8 · f1e50eca
Commit f1e50eca authored Oct 03, 2017 by Alexander Alekhin Committed by Alexander Alekhin Feb 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

ts.hpp modules/ts/include/opencv2/ts.hpp +8 -0

No files found.
--- a/modules/ts/include/opencv2/ts.hpp
+++ b/modules/ts/include/opencv2/ts.hpp
@@ -47,6 +47,14 @@
 #define GTEST_DONT_DEFINE_ASSERT_GT 0
 #define GTEST_DONT_DEFINE_TEST      0

+#ifndef GTEST_LANG_CXX11
+#if __cplusplus >= 201103L || (defined(_MSVC_LANG) && !(_MSVC_LANG < 201103))
+#  define GTEST_LANG_CXX11 1
+#  define GTEST_HAS_TR1_TUPLE 0
+#  define GTEST_HAS_COMBINE 1
+# endif
+#endif
+
 #include "opencv2/ts/ts_gtest.h"
 #include "opencv2/ts/ts_ext.hpp"