generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3848 from yxiong:fix-4125

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-03-23 08:04:41 +00:00
commit 7ab7322915
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/include/opencv2/core/cvstd.hpp
View File

@ -1040,9 +1040,11 @@ static inline bool operator>= (const String& lhs, const char* rhs) { return lh
#ifndef OPENCV_NOSTL_TRANSITIONAL #ifndef OPENCV_NOSTL_TRANSITIONAL
namespace std namespace std
{
static inline void swap(cv::String& a, cv::String& b) { a.swap(b); }
}
#else #else
namespace cv namespace cv
#endif
{ {
template<> inline template<> inline
void swap<cv::String>(cv::String& a, cv::String& b) void swap<cv::String>(cv::String& a, cv::String& b)
@ -1050,6 +1052,7 @@ namespace cv
a.swap(b); a.swap(b);
} }
} }
#endif
#include "opencv2/core/ptr.inl.hpp" #include "opencv2/core/ptr.inl.hpp"