diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-02-09 15:19:03 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-02-09 15:19:03 -0800 |
| commit | 2fa55f190efe5a0409be24c5107ddac79b2a3a6b (patch) | |
| tree | d931db935809d9614b970e68b1574bb55fa9918d /cpp/src/Ice/InputStream.cpp | |
| parent | Updated Objective-C mapping to use new stream classes (diff) | |
| download | ice-2fa55f190efe5a0409be24c5107ddac79b2a3a6b.tar.bz2 ice-2fa55f190efe5a0409be24c5107ddac79b2a3a6b.tar.xz ice-2fa55f190efe5a0409be24c5107ddac79b2a3a6b.zip | |
minor fixes to stream classes; restoring test/Ice/stream
Diffstat (limited to 'cpp/src/Ice/InputStream.cpp')
| -rw-r--r-- | cpp/src/Ice/InputStream.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index 5c73c51d6f1..c21da7740f3 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -1212,7 +1212,7 @@ Ice::InputStream::readOptImpl(Int readTag, OptionalFormat expectedFormat) } else if(tag < readTag) { - skipOpt(format); // Skip optional data members + skipOptional(format); // Skip optional data members } else { @@ -1229,7 +1229,7 @@ Ice::InputStream::readOptImpl(Int readTag, OptionalFormat expectedFormat) } void -Ice::InputStream::skipOpt(OptionalFormat type) +Ice::InputStream::skipOptional(OptionalFormat type) { switch(type) { @@ -1283,7 +1283,7 @@ Ice::InputStream::skipOpt(OptionalFormat type) } void -Ice::InputStream::skipOpts() +Ice::InputStream::skipOptionals() { // // Skip remaining un-read optional members. @@ -1307,7 +1307,7 @@ Ice::InputStream::skipOpts() { skipSize(); } - skipOpt(format); + skipOptional(format); } } @@ -2181,7 +2181,7 @@ Ice::InputStream::EncapsDecoder11::endSlice() { if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS) { - _stream->skipOpts(); + _stream->skipOptionals(); } // @@ -2298,7 +2298,7 @@ Ice::InputStream::EncapsDecoder11::skipSlice() } bool -Ice::InputStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::OptionalFormat expectedFormat) +Ice::InputStream::EncapsDecoder11::readOptional(Ice::Int readTag, Ice::OptionalFormat expectedFormat) { if(!_current) { |