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

core: prevent changes in 'std' namespace

Browse Source
This commit is contained in:
Alexander Alekhin 2016-05-30 17:49:54 +03:00
parent eca752368b
commit ff0601cda5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,11 @@
namespace cv
{
static inline uchar abs(uchar a) { return a; }
static inline ushort abs(ushort a) { return a; }
static inline unsigned abs(unsigned a) { return a; }
static inline uint64 abs(uint64 a) { return a; }
using std::min;
using std::max;
using std::abs;
@ -77,14 +82,6 @@ namespace cv
using std::log;
}
namespace std
{
static inline uchar abs(uchar a) { return a; }
static inline ushort abs(ushort a) { return a; }
static inline unsigned abs(unsigned a) { return a; }
static inline uint64 abs(uint64 a) { return a; }
}
#else
namespace cv
{