Merge pull request #3848 from yxiong:fix-4125

2015-03-23 08:04:41 +00:00 · 2015-03-23 08:04:41 +00:00 · 7ab7322915
commit 7ab7322915
parent daa99514fa decbdd1abb
1 changed files with 4 additions and 1 deletions
--- a/modules/core/include/opencv2/core/cvstd.hpp
+++ b/modules/core/include/opencv2/core/cvstd.hpp
@ -1040,9 +1040,11 @@ static inline bool operator>= (const String& lhs, const char*   rhs) { return lh

 #ifndef OPENCV_NOSTL_TRANSITIONAL
 namespace std
+{
+    static inline void swap(cv::String& a, cv::String& b) { a.swap(b); }
+}
 #else
 namespace cv
-#endif
 {
    template<> inline
    void swap<cv::String>(cv::String& a, cv::String& b)
@ -1050,6 +1052,7 @@ namespace cv
        a.swap(b);
    }
 }
+#endif

 #include "opencv2/core/ptr.inl.hpp"