diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-02-14 16:22:39 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-02-14 16:22:39 +0800 |
| commit | 294ec25fda6e3785c54970d274b860b1ca837955 (patch) | |
| tree | 26e5d1987ffdfde7bbacb87fdfb7b96bbef998e9 /cpp/src/IceStorm/Parser.cpp | |
| parent | Merge branch 'bug2435' (diff) | |
| download | ice-294ec25fda6e3785c54970d274b860b1ca837955.tar.bz2 ice-294ec25fda6e3785c54970d274b860b1ca837955.tar.xz ice-294ec25fda6e3785c54970d274b860b1ca837955.zip | |
merged bug2615
Diffstat (limited to 'cpp/src/IceStorm/Parser.cpp')
| -rw-r--r-- | cpp/src/IceStorm/Parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp index facd21440cf..58c8d6c0976 100644 --- a/cpp/src/IceStorm/Parser.cpp +++ b/cpp/src/IceStorm/Parser.cpp @@ -305,8 +305,8 @@ Parser::getInput(char* buf, int& result, int maxSize) } else { -#if defined(_MSC_VER) && !defined(_STLP_MSVC) - // COMPILERBUG: Stupid Visual C++ defines min and max as macros +#if defined(_MSC_VER) && _MSC_VER < 1500 && !defined(_STLP_MSVC) + // COMPILERBUG: Visual C++ defines min and max as macros result = _MIN(maxSize, static_cast<int>(_commands.length())); #else result = min(maxSize, static_cast<int>(_commands.length())); |