diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-08-07 12:55:19 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-08-07 12:55:19 -0400 |
| commit | 112865109733502c8024dbf785186a5c4cc599a6 (patch) | |
| tree | 8717a4f644eb181fa7eab28be8ad33b59c00e2bb /cpp/src/Slice/JavaUtil.cpp | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-112865109733502c8024dbf785186a5c4cc599a6.tar.bz2 ice-112865109733502c8024dbf785186a5c4cc599a6.tar.xz ice-112865109733502c8024dbf785186a5c4cc599a6.zip | |
Fixed compilation failure
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) { |