Fix Android build warnings

[profile/ivi/opencv.git] / modules / ts / include / opencv2 / ts / ts.hpp

diff --git a/modules/ts/include/opencv2/ts/ts.hpp b/modules/ts/include/opencv2/ts/ts.hpp
index a27d8b6..bf6e7e9 100644 (file)
--- a/modules/ts/include/opencv2/ts/ts.hpp
+++ b/modules/ts/include/opencv2/ts/ts.hpp
@@ -12,15 +12,19 @@
 
 #ifdef ANDROID
 # include <android/api-level.h>
-# define GTEST_HAS_CLONE (__ANDROID_API__ > 7 && __arm__)
+# define GTEST_HAS_CLONE (__ANDROID_API__ > 7 && !defined __i386__)
 # 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 <stdarg.h> // for va_list
 
-#if defined _MSC_VER && _MSC_VER >= 1200
-#pragma warning( disable: 4251 4275 4355 4127 )
+#ifdef _MSC_VER
+#pragma warning( disable: 4127 )
 #endif
 
 #define GTEST_DONT_DEFINE_FAIL      0
@@ -38,8 +42,8 @@
 #ifndef GTEST_USES_SIMPLE_RE
 #  define GTEST_USES_SIMPLE_RE 0
 #endif
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#ifndef GTEST_USES_POSIX_RE
+#  define GTEST_USES_POSIX_RE 0
 #endif
 
 #include "opencv2/core/core.hpp"