From decbdd1abb61a823edd25cedea272a4c0c89ba17 Mon Sep 17 00:00:00 2001
From: Ying Xiong <yxiong@seas.harvard.edu>
Date: Thu, 19 Mar 2015 14:23:44 -0400
Subject: [PATCH] Fix compiler error on std::swap (CUDA7.0/clang/OSX)

---
 modules/core/include/opencv2/core/cvstd.hpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/core/include/opencv2/core/cvstd.hpp b/modules/core/include/opencv2/core/cvstd.hpp
index 0da8faf3d1..a229f533e1 100644
--- 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"