Failure to compile with CUDA 7.0 + clang on OSX (Bug #4125)

When trying to compile OpenCV 3.0 (fresh github clone) on OSX with CUDA 7.0 (and clang, which is the default on OSX), I get the following error:

/Users/kevin/src/opencv/opencv-git/modules/core/include/opencv2/core/cvstd.hpp(1048): error: "swap" is not a class or function template name in the current scope

Compiling is fixed by the following diff:

diff --git a/modules/core/include/opencv2/core/cvstd.hpp b/modules/core/include/opencv2/core/cvstd.hpp
index 0da8faf..8c2e96f 100644
--- a/modules/core/include/opencv2/core/cvstd.hpp
+++ b/modules/core/include/opencv2/core/cvstd.hpp
@@ -1040,16 +1040,15 @@ 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)
-    {
-        a.swap(b);
-    }
+    template<> inline void swap<cv::String>(cv::String& a, cv::String& b) { a.swap(b); }
 }
+#endif

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

If this fix will work, I can submit a PR, but I highly suspect there is a better fix.