diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-05-08 18:14:39 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-05-08 18:14:39 -0700 |
| commit | 7774bb92669779fd165a0510a360fdaecd69f0c3 (patch) | |
| tree | 8ea8bba6cac4128cd3e511ff21534db130ff8e49 /cpp/include/Ice/Exception.h | |
| parent | Fixed ICE-4709, batch requests and UnmarshalOutOfBoundsException (diff) | |
| download | ice-7774bb92669779fd165a0510a360fdaecd69f0c3.tar.bz2 ice-7774bb92669779fd165a0510a360fdaecd69f0c3.tar.xz ice-7774bb92669779fd165a0510a360fdaecd69f0c3.zip | |
* C++ implementation for compact/sliced formats
* C++ implementation for "preserve-slice" metadata
* C++ tests for compact/sliced/preserved types
* Updated stream API
* Python changes for stream API
* Python tests for compact/sliced formats
* Added Ice.Default.SlicedFormat property
Diffstat (limited to 'cpp/include/Ice/Exception.h')
| -rw-r--r-- | cpp/include/Ice/Exception.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index fff6c741922..d8ffd574f1c 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -12,6 +12,7 @@ #include <IceUtil/Exception.h> #include <Ice/Config.h> +#include <Ice/Format.h> #include <Ice/Handle.h> namespace IceInternal @@ -37,7 +38,7 @@ typedef IceUtil::Exception Exception; class ICE_API LocalException : public IceUtil::Exception { -public: +public: LocalException(const char*, int); virtual ~LocalException() throw(); @@ -46,19 +47,19 @@ public: virtual void ice_throw() const = 0; }; - class ICE_API UserException : public IceUtil::Exception { -public: +public: virtual std::string ice_name() const = 0; virtual Exception* ice_clone() const = 0; virtual void ice_throw() const = 0; virtual void __write(::IceInternal::BasicStream*) const = 0; - virtual void __read(::IceInternal::BasicStream*, bool) = 0; + virtual void __read(::IceInternal::BasicStream*) = 0; virtual bool __usesClasses() const; + virtual void __usesClasses(bool); }; typedef ::IceInternal::Handle<UserException> UserExceptionPtr; @@ -76,7 +77,6 @@ public: typedef ::IceInternal::Handle<SystemException> SystemExceptionPtr; - #if defined(__SUNPRO_CC) // // COMPILERFIX: With Sun CC the presence of the overloaded operator |