diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-10-15 13:52:10 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-10-15 13:52:10 -0700 |
| commit | eb78cf7bfb7038af9063547a2183861205325796 (patch) | |
| tree | 22f0ffcb06cd2e47468b0a1a59ffcd34eac30eae /cpp | |
| parent | Merge branch 'master' of ssh://git/home/git/ice (diff) | |
| download | ice-eb78cf7bfb7038af9063547a2183861205325796.tar.bz2 ice-eb78cf7bfb7038af9063547a2183861205325796.tar.xz ice-eb78cf7bfb7038af9063547a2183861205325796.zip | |
Fixes for stream API, PHP 5.4, Python 3.3
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Stream.h | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/Stream.cpp | 24 |
2 files changed, 30 insertions, 0 deletions
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index e40c6ead949..21b53d9cb24 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -78,6 +78,9 @@ public: protected: + virtual void __writeImpl(::IceInternal::BasicStream*) const; + virtual void __readImpl(::IceInternal::BasicStream*); + const CommunicatorPtr _communicator; }; @@ -409,6 +412,9 @@ public: protected: + virtual void __writeImpl(::IceInternal::BasicStream*) const; + virtual void __readImpl(::IceInternal::BasicStream*); + const CommunicatorPtr _communicator; }; diff --git a/cpp/src/Ice/Stream.cpp b/cpp/src/Ice/Stream.cpp index 3ff69d76bac..58d98324113 100644 --- a/cpp/src/Ice/Stream.cpp +++ b/cpp/src/Ice/Stream.cpp @@ -15,3 +15,27 @@ using namespace IceInternal; IceUtil::Shared* Ice::upCast(InputStream* p) { return p; } IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; } + +void +Ice::UserExceptionReader::__writeImpl(::IceInternal::BasicStream*) const +{ + assert(false); // Should never be called. +} + +void +Ice::UserExceptionReader::__readImpl(::IceInternal::BasicStream*) +{ + assert(false); // Should never be called. +} + +void +Ice::UserExceptionWriter::__writeImpl(::IceInternal::BasicStream*) const +{ + assert(false); // Should never be called. +} + +void +Ice::UserExceptionWriter::__readImpl(::IceInternal::BasicStream*) +{ + assert(false); // Should never be called. +} |