Merge pull request #205 from taka-no-me/gtest_r629

Update googletest to the latest upstream

Merge pull request #205 from taka-no-me/gtest_r629
Update googletest to the latest upstream
f7dc98f6 · Andrey Kamaev · 9c6eed0b · b0d38303 · f7dc98f6 · f7dc98f6
Commit f7dc98f6 authored Dec 10, 2012 by Andrey Kamaev
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 11 deletions

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

ts_gtest.h modules/ts/include/opencv2/ts/ts_gtest.h +0 -0

ts_gtest.cpp modules/ts/src/ts_gtest.cpp +0 -0

No files found.
--- a/modules/ts/include/opencv2/ts/ts.hpp
+++ b/modules/ts/include/opencv2/ts/ts.hpp
@@ -10,17 +10,6 @@
 #endif
 #endif
-#ifdef ANDROID
-# include <android/api-level.h>
-# define GTEST_HAS_CLONE (__ANDROID_API__ > 7 && !defined __i386__)
-# define GTEST_HAS_POSIX_RE (__ANDROID_API__ > 7)
-# if defined _GLIBCXX_USE_WCHAR_T && _GLIBCXX_USE_WCHAR_T
-#  define GTEST_HAS_STD_WSTRING 1
-# else
-#  define GTEST_HAS_STD_WSTRING 0
-#endif
-#endif
 #include <stdarg.h> // for va_list
 #ifdef _MSC_VER

--- a/modules/ts/include/opencv2/ts/ts_gtest.h
+++ b/modules/ts/include/opencv2/ts/ts_gtest.h
--- a/modules/ts/src/ts_gtest.cpp
+++ b/modules/ts/src/ts_gtest.cpp