diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:49:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:49:02 +0200 |
| commit | 5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec (patch) | |
| tree | 71f7dd2a1096dab81bd8ddb4e17d5ac42f38c65d /cpp/src/Slice/JavaUtil.cpp | |
| parent | Fixes (diff) | |
| parent | Fixed python & ruby compilation error caused by OutputStream::format removal (diff) | |
| download | ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.bz2 ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.xz ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 781b020c0c8..45f10b1a004 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -1547,7 +1547,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, } else { - const int wireSize = keyType->minWireSize() + valueType->minWireSize(); + const size_t wireSize = keyType->minWireSize() + valueType->minWireSize(); string tmpName; if(optionalParam && optionalMapping) { @@ -1726,7 +1726,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, (elemBuiltin->kind() != Builtin::KindByte && elemBuiltin->kind() != Builtin::KindBool)) { out << nl << "final int __optSize = " << tmpName << " == null ? 0 : " << tmpName << ".size();"; - const int wireSize = elemType->minWireSize(); + const size_t wireSize = elemType->minWireSize(); if(wireSize > 1) { @@ -1773,7 +1773,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out, elemBuiltin->kind() != Builtin::KindBool)) { out << nl << "final int __optSize = " << tmpName << " == null ? 0 : " << tmpName << ".length;"; - const int wireSize = elemType->minWireSize(); + const size_t wireSize = elemType->minWireSize(); if(wireSize > 1) { @@ -2795,7 +2795,7 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out, } else { - const int wireSize = keyType->minWireSize() + valueType->minWireSize(); + const size_t wireSize = keyType->minWireSize() + valueType->minWireSize(); out << nl << "final int __optSize = " << v << " == null ? 0 : " << v << ".size();"; out << nl << stream << ".writeSize(__optSize > 254 ? __optSize * " << wireSize << " + 5 : __optSize * " << wireSize << " + 1);"; @@ -2854,7 +2854,7 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out, (elemBuiltin->kind() != Builtin::KindByte && elemBuiltin->kind() != Builtin::KindBool)) { out << nl << "final int __optSize = " << v << " == null ? 0 : " << v << ".size();"; - const int wireSize = elemType->minWireSize(); + const size_t wireSize = elemType->minWireSize(); if(wireSize > 1) { @@ -2889,7 +2889,7 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out, elemBuiltin->kind() != Builtin::KindBool)) { out << nl << "final int __optSize = " << v << " == null ? 0 : " << v << ".length;"; - const int wireSize = elemType->minWireSize(); + const size_t wireSize = elemType->minWireSize(); if(wireSize > 1) { |