diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-28 11:18:25 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-28 11:18:25 +0100 |
| commit | 505c27be641d9855aa682affb204f118b1ce69f1 (patch) | |
| tree | 406d1323320961802695285315ce6f72cce6447a /cpp/src/Ice/StreamI.h | |
| parent | ICE-5191: support for zero-copy on x86_64 (diff) | |
| download | ice-505c27be641d9855aa682affb204f118b1ce69f1.tar.bz2 ice-505c27be641d9855aa682affb204f118b1ce69f1.tar.xz ice-505c27be641d9855aa682affb204f118b1ce69f1.zip | |
ICE-5198: zero-copy OutputStream::finished method
Diffstat (limited to 'cpp/src/Ice/StreamI.h')
| -rw-r--r-- | cpp/src/Ice/StreamI.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h index f1490faddc2..30b21efe76b 100644 --- a/cpp/src/Ice/StreamI.h +++ b/cpp/src/Ice/StreamI.h @@ -57,17 +57,17 @@ public: virtual void endSlice(); virtual void skipSlice(); - virtual Ice::EncodingVersion startEncapsulation(); + virtual EncodingVersion startEncapsulation(); virtual void endEncapsulation(); - virtual Ice::EncodingVersion skipEncapsulation(); + virtual EncodingVersion skipEncapsulation(); - virtual Ice::EncodingVersion getEncoding() const; + virtual EncodingVersion getEncoding() const; virtual void readPendingObjects(); virtual void rewind(); - virtual void skip(Ice::Int); + virtual void skip(Int); virtual void skipSize(); virtual void read(bool&); @@ -163,15 +163,16 @@ public: virtual void startSlice(const std::string&, int, bool); virtual void endSlice(); - virtual void startEncapsulation(const Ice::EncodingVersion&, FormatType); + virtual void startEncapsulation(const EncodingVersion&, FormatType); virtual void startEncapsulation(); virtual void endEncapsulation(); - virtual Ice::EncodingVersion getEncoding() const; + virtual EncodingVersion getEncoding() const; virtual void writePendingObjects(); virtual void finished(std::vector< Byte >&); + virtual std::pair<const Byte*, const Byte*> finished(); virtual void reset(bool); |