diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-10-17 12:38:03 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-10-17 12:38:03 -0700 |
| commit | f087326373250c76fa3b7b8e68cede0cb9af01ff (patch) | |
| tree | e801ec18aba93a74b373388fc947617643da0008 /cpp/src/Ice/BasicStream.cpp | |
| parent | Fix related to ICE-4847 (diff) | |
| download | ice-f087326373250c76fa3b7b8e68cede0cb9af01ff.tar.bz2 ice-f087326373250c76fa3b7b8e68cede0cb9af01ff.tar.xz ice-f087326373250c76fa3b7b8e68cede0cb9af01ff.zip | |
ICE-4619 - custom enumerator values
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
| -rwxr-xr-x | cpp/src/Ice/BasicStream.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 52bf8c72e54..cd32101f980 100755 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1511,17 +1511,17 @@ IceInternal::BasicStream::read(ObjectPrx& v) } Int -IceInternal::BasicStream::readEnum(Int limit) +IceInternal::BasicStream::readEnum(Int maxValue) { if(getReadEncoding() == Encoding_1_0) { - if(limit <= 127) + if(maxValue < 127) { Byte value; read(value); return value; } - else if(limit <= 32767) + else if(maxValue < 32767) { Short value; read(value); @@ -1541,15 +1541,15 @@ IceInternal::BasicStream::readEnum(Int limit) } void -IceInternal::BasicStream::writeEnum(Int v, Int limit) +IceInternal::BasicStream::writeEnum(Int v, Int maxValue) { if(getWriteEncoding() == Encoding_1_0) { - if(limit <= 127) + if(maxValue < 127) { write(static_cast<Byte>(v)); } - else if(limit <= 32767) + else if(maxValue < 32767) { write(static_cast<Short>(v)); } |