summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-10-18 00:22:00 +0200
committerJose <jose@zeroc.com>2012-10-18 00:22:00 +0200
commitb8b097d186cd816e7c238b261e35e0a5ccf7b180 (patch)
treeb42d82489d37cba4aeb9caafef54d6a01059d4a6 /cpp/src
parentvsaddin fixes (diff)
downloadice-b8b097d186cd816e7c238b261e35e0a5ccf7b180.tar.bz2
ice-b8b097d186cd816e7c238b261e35e0a5ccf7b180.tar.xz
ice-b8b097d186cd816e7c238b261e35e0a5ccf7b180.zip
Minor fix for VS2010 builds
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/Parser.cpp4
-rw-r--r--cpp/src/IceGrid/Parser.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index a2eac633f04..e17cdc115c3 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2188,7 +2188,7 @@ Parser::showWarranty()
}
void
-Parser::getInput(char* buf, size_t& result, size_t maxSize)
+Parser::getInput(char* buf, int& result, int maxSize)
{
if(!_commands.empty())
{
@@ -2198,7 +2198,7 @@ Parser::getInput(char* buf, size_t& result, size_t maxSize)
}
else
{
- result = min(maxSize, _commands.length());
+ result = min(maxSize, static_cast<int>(_commands.length()));
strncpy(buf, _commands.c_str(), result);
_commands.erase(0, result);
if(_commands.empty())
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index 29006dd998e..0234d1a43f6 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -126,7 +126,7 @@ public:
void showCopying();
void showWarranty();
- void getInput(char*, size_t&, size_t);
+ void getInput(char*, int&, int);
void continueLine();
const char* getPrompt();