summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Parser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
-rw-r--r--cpp/src/IceGrid/Parser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index c36bfd4eeb2..9ab3f547738 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2017,8 +2017,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()));