From f1e50ecab32060d89934cc62e84117064ed386db Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 3 Oct 2017 18:26:14 +0300 Subject: [PATCH] ts: fix missing std::tr1 (C++17) --- modules/ts/include/opencv2/ts.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp index 82e945aaa0..934dff10aa 100644 --- 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"