diff options
| author | Jose <jose@zeroc.com> | 2012-10-20 00:48:37 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-10-20 00:48:37 +0200 |
| commit | f4cd574da6a31c78bb659525f444eec1c602d456 (patch) | |
| tree | c2c760c81e2db06e268702f44f7be57f2f05bb47 /cpp/src | |
| parent | Fixed ICE-4897: replace novc6 by novc90 (diff) | |
| download | ice-f4cd574da6a31c78bb659525f444eec1c602d456.tar.bz2 ice-f4cd574da6a31c78bb659525f444eec1c602d456.tar.xz ice-f4cd574da6a31c78bb659525f444eec1c602d456.zip | |
IceGrid parser fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Parser.h | 2 |
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(); |