diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-07-17 12:36:00 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-07-17 12:36:00 -0230 |
| commit | 93fdab6fa782511ef569acb17352853646aa66b5 (patch) | |
| tree | 1e73a243303f1d9564499f0b7a036b4484cc1671 /cpp/src/Ice/StreamI.h | |
| parent | C# transceiver fixes (diff) | |
| download | ice-93fdab6fa782511ef569acb17352853646aa66b5.tar.bz2 ice-93fdab6fa782511ef569acb17352853646aa66b5.tar.xz ice-93fdab6fa782511ef569acb17352853646aa66b5.zip | |
ICE-5481 startSize/endSize methods aren't designed to be "reentrant"
Diffstat (limited to 'cpp/src/Ice/StreamI.h')
| -rw-r--r-- | cpp/src/Ice/StreamI.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h index 4ea957be74d..a31dc213346 100644 --- a/cpp/src/Ice/StreamI.h +++ b/cpp/src/Ice/StreamI.h @@ -69,7 +69,7 @@ public: virtual void skip(Int); virtual void skipSize(); - + virtual void read(bool&); virtual void read(Byte&); virtual void read(Short&); @@ -103,7 +103,7 @@ public: private: void initialize(IceInternal::Instance*, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool); - + const CommunicatorPtr _communicator; IceInternal::BasicStream* _is; std::vector< ReadObjectCallbackPtr > _callbacks; @@ -127,7 +127,7 @@ public: virtual void writeObject(const ObjectPtr&); virtual void writeException(const UserException&); virtual void writeProxy(const ObjectPrx&); - + virtual void writeSize(Int); virtual void write(bool); @@ -182,8 +182,8 @@ public: virtual size_type pos(); virtual void rewrite(Int, size_type); - virtual void startSize(); - virtual void endSize(); + virtual int startSize(); + virtual void endSize(int pos); private: |