diff options
Diffstat (limited to 'cpp/src/Ice/Exception.cpp')
| -rw-r--r-- | cpp/src/Ice/Exception.cpp | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 20203c94d52..8377c6c2230 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -12,8 +12,8 @@ #include <Ice/Network.h> #include <Ice/Plugin.h> #include <Ice/SlicedData.h> -#include <Ice/BasicStream.h> -#include <Ice/Stream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <IceUtil/StringUtil.h> #ifdef ICE_OS_WINRT # include <IceUtil/StringConverter.h> @@ -103,23 +103,7 @@ throwMarshalException(const char* file, int line, const string& reason) } void -Ice::UserException::__write(::IceInternal::BasicStream* os) const -{ - os->startWriteException(0); - __writeImpl(os); - os->endWriteException(); -} - -void -Ice::UserException::__read(::IceInternal::BasicStream* is) -{ - is->startReadException(); - __readImpl(is); - is->endReadException(false); -} - -void -Ice::UserException::__write(const Ice::OutputStreamPtr& os) const +Ice::UserException::__write(::Ice::OutputStream* os) const { os->startException(0); __writeImpl(os); @@ -127,25 +111,13 @@ Ice::UserException::__write(const Ice::OutputStreamPtr& os) const } void -Ice::UserException::__read(const Ice::InputStreamPtr& is) +Ice::UserException::__read(::Ice::InputStream* is) { is->startException(); __readImpl(is); is->endException(false); } -void -Ice::UserException::__writeImpl(const Ice::OutputStreamPtr&) const -{ - throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support"); -} - -void -Ice::UserException::__readImpl(const Ice::InputStreamPtr&) -{ - throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support"); -} - bool Ice::UserException::__usesClasses() const { |