summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Parser.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-08-08 18:52:08 +0200
committerJose <jose@zeroc.com>2012-08-08 18:52:08 +0200
commit0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545 (patch)
tree8067c6695cc5e9672582a904409846e38ffba593 /cpp/src/IceGrid/Parser.cpp
parentFixed python & ruby compilation error caused by OutputStream::format removal (diff)
downloadice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.bz2
ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.xz
ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.zip
remove VC6 support
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
-rw-r--r--cpp/src/IceGrid/Parser.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 32143e1b138..e80d54408b1 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2094,12 +2094,7 @@ Parser::getInput(char* buf, int& result, int maxSize)
}
else
{
-#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()));
-#endif
strncpy(buf, _commands.c_str(), result);
_commands.erase(0, result);
if(_commands.empty())