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 /java/src/Ice/OutputStreamI.java | |
| 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 'java/src/Ice/OutputStreamI.java')
| -rw-r--r-- | java/src/Ice/OutputStreamI.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/java/src/Ice/OutputStreamI.java b/java/src/Ice/OutputStreamI.java index 0a28528037f..67a51d4cbe5 100644 --- a/java/src/Ice/OutputStreamI.java +++ b/java/src/Ice/OutputStreamI.java @@ -172,12 +172,6 @@ public class OutputStreamI implements OutputStream } public void - format(FormatType format) - { - _os.format(format); - } - - public void startObject(SlicedData slicedData) { _os.startWriteObject(slicedData); @@ -214,9 +208,9 @@ public class OutputStreamI implements OutputStream } public void - startEncapsulation(Ice.EncodingVersion encoding) + startEncapsulation(Ice.EncodingVersion encoding, Ice.FormatType format) { - _os.startWriteEncaps(encoding); + _os.startWriteEncaps(encoding, format); } public void |