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

7 years ago · f1e50ecab3
parent a0ce12f8ba
commit f1e50ecab3
1 changed files with 8 additions and 0 deletions
--- 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"