diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-07-06 00:18:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-07-06 00:18:03 +0200 |
| commit | 54d8f3fb0d3d53f851051980f1bc941c4e39a60f (patch) | |
| tree | 0d8259f0cd48b3ba0a3792556821aa41d6f718a7 /cpp/include | |
| parent | Fixed ICE-8223 - renamed cloneImpl to _iceCloneImpl (diff) | |
| download | ice-54d8f3fb0d3d53f851051980f1bc941c4e39a60f.tar.bz2 ice-54d8f3fb0d3d53f851051980f1bc941c4e39a60f.tar.xz ice-54d8f3fb0d3d53f851051980f1bc941c4e39a60f.zip | |
Added Ice::UserException::ice_getSlicedData and Ice::UnkownSlicedValue::ice_id methods
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Exception.h | 12 | ||||
| -rw-r--r-- | cpp/include/Ice/SlicedData.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index cb50bd2a9c1..8c5803b9d24 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -16,6 +16,7 @@ #include <Ice/Handle.h> #include <Ice/ObjectF.h> #include <Ice/ValueF.h> +#include <Ice/SlicedDataF.h> namespace Ice { @@ -57,19 +58,20 @@ class ICE_API UserException : public IceUtil::Exception { public: - virtual void _write(::Ice::OutputStream*) const; - virtual void _read(::Ice::InputStream*); - - virtual bool _usesClasses() const; - #ifdef ICE_CPP11_MAPPING std::unique_ptr<UserException> ice_clone() const; #else virtual UserException* ice_clone() const = 0; #endif + virtual Ice::SlicedDataPtr ice_getSlicedData() const; static const std::string& ice_staticId(); + virtual void _write(::Ice::OutputStream*) const; + virtual void _read(::Ice::InputStream*); + + virtual bool _usesClasses() const; + protected: virtual void _writeImpl(::Ice::OutputStream*) const {} diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h index bd3761840d9..b4837274b19 100644 --- a/cpp/include/Ice/SlicedData.h +++ b/cpp/include/Ice/SlicedData.h @@ -99,11 +99,8 @@ public: UnknownSlicedValue(const std::string&); - const std::string& getUnknownTypeId() const; - #ifdef ICE_CPP11_MAPPING virtual SlicedDataPtr ice_getSlicedData() const override; - virtual std::string ice_id() const override; std::shared_ptr<UnknownSlicedValue> ice_clone() const; @@ -115,6 +112,7 @@ protected: virtual std::shared_ptr<Value> _iceCloneImpl() const override; #else virtual SlicedDataPtr ice_getSlicedData() const; + virtual const std::string& ice_id(const Current& = Ice::emptyCurrent) const; virtual void _iceGcVisitMembers(IceInternal::GCVisitor&); virtual void _iceWrite(::Ice::OutputStream*) const; |