diff options
author | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
commit | ef571f80c545d30a5a2330b2d835f9c6441616a1 (patch) | |
tree | fce9620a538899c44d8471a0e798c4ff134dead8 /cpp/src/IceGrid/Parser.cpp | |
parent | Java/C# factory fix (diff) | |
download | ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.bz2 ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.xz ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.zip |
Fixed ICE-4884:
Updated version to 3.5b
Some fixes to distribution/bin/fixVersion.py
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
-rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index e17cdc115c3..15b9f2f5b4a 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -2263,7 +2263,7 @@ Parser::getInput(char* buf, int& result, int maxSize) } } - result = line.length(); + result = static_cast<int>(line.length()); if(result > maxSize) { error("input line too long"); |