diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/src/Ice/StreamI.cpp | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/src/Ice/StreamI.cpp')
| -rw-r--r-- | cpp/src/Ice/StreamI.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp index 91c658abcf2..e1e73f94617 100644 --- a/cpp/src/Ice/StreamI.cpp +++ b/cpp/src/Ice/StreamI.cpp @@ -577,12 +577,6 @@ OutputStreamI::writeOptional(Int tag, OptionalType type) } void -OutputStreamI::format(FormatType format) -{ - _os->format(format); -} - -void OutputStreamI::startObject(const SlicedDataPtr& slicedData) { _os->startWriteObject(slicedData); @@ -619,9 +613,9 @@ OutputStreamI::endSlice() } void -OutputStreamI::startEncapsulation(const EncodingVersion& version) +OutputStreamI::startEncapsulation(const EncodingVersion& version, FormatType format) { - _os->startWriteEncaps(version); + _os->startWriteEncaps(version, format); } void |