diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-02-07 11:02:26 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-02-07 11:02:26 -0800 |
| commit | c46e33634477cc0f2ca521a41cd235736c93c369 (patch) | |
| tree | b621ff90c930e1ea617a738d974d8bcfbcde88f1 /cpp | |
| parent | Fixed VC90 compilation error (diff) | |
| download | ice-c46e33634477cc0f2ca521a41cd235736c93c369.tar.bz2 ice-c46e33634477cc0f2ca521a41cd235736c93c369.tar.xz ice-c46e33634477cc0f2ca521a41cd235736c93c369.zip | |
VC9 fix
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Parser.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Freeze/complex/Parser.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index c36bfd4eeb2..61477f85f6a 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -2017,7 +2017,7 @@ Parser::getInput(char* buf, int& result, int maxSize) } else { -#if defined(_MSC_VER) && !defined(_STLP_MSVC) +#if defined(_MSC_VER) && _MSC_VER < 1500 && !defined(_STLP_MSVC) // COMPILERBUG: Stupid Visual C++ defines min and max as macros result = _MIN(maxSize, static_cast<int>(_commands.length())); #else diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp index facd21440cf..36fd52f4a6f 100644 --- a/cpp/src/IceStorm/Parser.cpp +++ b/cpp/src/IceStorm/Parser.cpp @@ -305,7 +305,7 @@ Parser::getInput(char* buf, int& result, int maxSize) } else { -#if defined(_MSC_VER) && !defined(_STLP_MSVC) +#if defined(_MSC_VER) && _MSC_VER < 1500 && !defined(_STLP_MSVC) // COMPILERBUG: Stupid Visual C++ defines min and max as macros result = _MIN(maxSize, static_cast<int>(_commands.length())); #else diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp index 8d1754cb503..3bedb944b4f 100644 --- a/cpp/test/Freeze/complex/Parser.cpp +++ b/cpp/test/Freeze/complex/Parser.cpp @@ -69,7 +69,7 @@ Parser::getInput(char* buf, int& result, int maxSize) { if(!_buf.empty()) { -#if defined(_MSC_VER) && !defined(_STLP_MSVC) +#if defined(_MSC_VER) && _MSC_VER < 1500 && !defined(_STLP_MSVC) // COMPILERBUG: Stupid Visual C++ defines min and max as macros result = _MIN(maxSize, static_cast<int>(_buf.length())); #else |