Fixed STD_MIN/MAX again for VCToolkit2003: SDK2003R2/CL14.00.40310.41 defines _MAX as _cpp_max and _cpp_max is a template under std. VCToolkit2003/CL13.10.3052 has a template _MAX under std but also does "#define _MAX (max)" so we cannot use "std::_MAX" and have to rely on the "(std::max)" trick.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6503 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
6bba242764
commit
59e19c8c94
1 changed files with 1 additions and 1 deletions
|
@ -130,7 +130,7 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
|
|||
|
||||
#ifdef __cplusplus
|
||||
#include <algorithm>
|
||||
#if defined(_MSC_VER) && (_MSC_VER <= 1200 || (defined(_MIN)&&_MSC_FULL_VER<=140040310))
|
||||
#if defined(_MSC_VER) && ( _MSC_VER <= 1200 || (defined(_MIN)&&_MSC_FULL_VER<=140040310) ) && _MSC_FULL_VER!=13103052
|
||||
#define STD_MIN std::_MIN
|
||||
#define STD_MAX std::_MAX
|
||||
#else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue