Fixed WString related build problem in Android build

2012-06-18 13:08:59 +00:00
parent 3b55e0d4e9
commit 7dcbf32532
2 changed files with 5 additions and 2 deletions
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@@ -151,7 +151,7 @@ cv::string cv::FileStorage::getDefaultObjectName(const string& _filename)

 namespace cv
 {
-#if !defined(ANDROID) || defined(_GLIBCXX_USE_WCHAR_T)
+#if !defined(ANDROID) || (defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
 string fromUtf16(const WString& str)
 {
    cv::AutoBuffer<char> _buf(str.size()*4 + 1);