projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cddac5d
)
Fixed Android build warnings for old NDK
author
Andrey Kamaev
<no@email>
Thu, 14 Jun 2012 14:52:00 +0000
(14:52 +0000)
committer
Andrey Kamaev
<no@email>
Thu, 14 Jun 2012 14:52:00 +0000
(14:52 +0000)
modules/ts/include/opencv2/ts/ts.hpp
patch
|
blob
|
history
diff --git
a/modules/ts/include/opencv2/ts/ts.hpp
b/modules/ts/include/opencv2/ts/ts.hpp
index
dec80b6
..
b51bfb7
100644
(file)
--- a/
modules/ts/include/opencv2/ts/ts.hpp
+++ b/
modules/ts/include/opencv2/ts/ts.hpp
@@
-14,7
+14,11
@@
# include <android/api-level.h>
# 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 <stdarg.h> // for va_list