diff options
author | Stephen Kelly <steveire@gmail.com> | 2014-11-20 21:17:16 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2014-11-20 21:17:16 (GMT) |
commit | fdb73547220ed9e9bee0806abf388b830ac79bd5 (patch) | |
tree | 9bc7c75ae447aa6ac161bc2f32be46ff08b9b244 /Source | |
parent | 3a20cef3d71ab55c77aa85b05217e13afabb35b4 (diff) | |
download | CMake-fdb73547220ed9e9bee0806abf388b830ac79bd5.zip CMake-fdb73547220ed9e9bee0806abf388b830ac79bd5.tar.gz CMake-fdb73547220ed9e9bee0806abf388b830ac79bd5.tar.bz2 |
cmTarget: Remove std::min and std::max MSVC6 compatibility code.
CMake is no longer required to build with MSVC6.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmTarget.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ee62f06..d4889fd 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -4781,16 +4781,6 @@ std::pair<bool, const char*> consistentStringProperty(const char *lhs, 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, const char *rhs, @@ -4822,11 +4812,11 @@ std::pair<bool, const char*> consistentNumberProperty(const char *lhs, 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 { - return std::make_pair(true, cmMinimum(lnum, rnum) == lnum ? lhs : rhs); + return std::make_pair(true, std::min(lnum, rnum) == lnum ? lhs : rhs); } } |