From 542563c4442551affe7f8b2e89b3adc84da4f8a2 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 14 Jun 2012 14:52:00 +0000 Subject: [PATCH] Fixed Android build warnings for old NDK --- modules/ts/include/opencv2/ts/ts.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/ts/include/opencv2/ts/ts.hpp b/modules/ts/include/opencv2/ts/ts.hpp index dec80b6591..b51bfb7753 100644 --- a/modules/ts/include/opencv2/ts/ts.hpp +++ b/modules/ts/include/opencv2/ts/ts.hpp @@ -14,7 +14,11 @@ # include # define GTEST_HAS_CLONE (__ANDROID_API__ > 7 && __arm__) # define GTEST_HAS_POSIX_RE (__ANDROID_API__ > 7) -# define GTEST_HAS_STD_WSTRING _GLIBCXX_USE_WCHAR_T +# 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 // for va_list