kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmTarget: Remove std::min and std::max MSVC6 compatibility code. 

CMake is no longer required to build with MSVC6.
This commit is contained in:
Stephen Kelly 2014-11-20 22:17:16 +01:00
parent 3a20cef3d7
commit fdb7354722
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmTarget.cxx
View File

@ -4781,16 +4781,6 @@ std::pair<bool, const char*> consistentStringProperty(const char *lhs,
return std::make_pair(b, b ? lhs : 0); return std::make_pair(b, b ? lhs : 0);
} }
#if defined(_MSC_VER) && _MSC_VER <= 1200
template<typename T> const T&
cmMaximum(const T& l, const T& r) {return l > r ? l : r;}
template<typename T> const T&
cmMinimum(const T& l, const T& r) {return l < r ? l : r;}
#else
#define cmMinimum std::min
#define cmMaximum std::max
#endif
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::pair<bool, const char*> consistentNumberProperty(const char *lhs, std::pair<bool, const char*> consistentNumberProperty(const char *lhs,
const char *rhs, const char *rhs,
@ -4822,11 +4812,11 @@ std::pair<bool, const char*> consistentNumberProperty(const char *lhs,
if (t == NumberMaxType) if (t == NumberMaxType)
{ {
return std::make_pair(true, cmMaximum(lnum, rnum) == lnum ? lhs : rhs); return std::make_pair(true, std::max(lnum, rnum) == lnum ? lhs : rhs);
} }
else else
{ {
return std::make_pair(true, cmMinimum(lnum, rnum) == lnum ? lhs : rhs); return std::make_pair(true, std::min(lnum, rnum) == lnum ? lhs : rhs);
} }
} }