diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-07-05 16:50:46 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-07-05 16:50:46 +0200 |
| commit | ad8595525980d30ce3c528b3c668a7cc744e2e14 (patch) | |
| tree | 1506a6d20846b395b23afaf2c7fc6dff3eef8efb /cpp/include | |
| parent | Fixed IceSSL SecureTransport memory leaks (diff) | |
| download | ice-ad8595525980d30ce3c528b3c668a7cc744e2e14.tar.bz2 ice-ad8595525980d30ce3c528b3c668a7cc744e2e14.tar.xz ice-ad8595525980d30ce3c528b3c668a7cc744e2e14.zip | |
Fixed ICE-8223 - renamed cloneImpl to _iceCloneImpl
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/Object.h | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/SlicedData.h | 11 | ||||
| -rw-r--r-- | cpp/include/Ice/Value.h | 13 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index f506d9c6e7c..b2320d76f0b 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -23,7 +23,7 @@ namespace Ice { class OutputStream; -class InpputStream; +class InputStream; } diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h index a97b385200e..bd3761840d9 100644 --- a/cpp/include/Ice/SlicedData.h +++ b/cpp/include/Ice/SlicedData.h @@ -102,22 +102,23 @@ public: const std::string& getUnknownTypeId() const; #ifdef ICE_CPP11_MAPPING - virtual void _iceWrite(::Ice::OutputStream*) const override; - virtual void _iceRead(::Ice::InputStream*) override; virtual SlicedDataPtr ice_getSlicedData() const override; virtual std::string ice_id() const override; std::shared_ptr<UnknownSlicedValue> ice_clone() const; + virtual void _iceWrite(::Ice::OutputStream*) const override; + virtual void _iceRead(::Ice::InputStream*) override; + protected: - virtual std::shared_ptr<Value> cloneImpl() const override; + virtual std::shared_ptr<Value> _iceCloneImpl() const override; #else - virtual void _iceGcVisitMembers(IceInternal::GCVisitor&); + virtual SlicedDataPtr ice_getSlicedData() const; + virtual void _iceGcVisitMembers(IceInternal::GCVisitor&); virtual void _iceWrite(::Ice::OutputStream*) const; virtual void _iceRead(::Ice::InputStream*); - virtual SlicedDataPtr ice_getSlicedData() const; #endif private: diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h index d2dcf22052e..f4702620d3c 100644 --- a/cpp/include/Ice/Value.h +++ b/cpp/include/Ice/Value.h @@ -39,9 +39,6 @@ public: virtual void ice_preMarshal(); virtual void ice_postUnmarshal(); - virtual void _iceWrite(Ice::OutputStream*) const; - virtual void _iceRead(Ice::InputStream*); - virtual std::string ice_id() const; static const std::string& ice_staticId(); @@ -49,10 +46,12 @@ public: virtual std::shared_ptr<SlicedData> ice_getSlicedData() const; -protected: + virtual void _iceWrite(Ice::OutputStream*) const; + virtual void _iceRead(Ice::InputStream*); - virtual std::shared_ptr<Value> cloneImpl() const = 0; +protected: + virtual std::shared_ptr<Value> _iceCloneImpl() const = 0; virtual void _iceWriteImpl(Ice::OutputStream*) const {} virtual void _iceReadImpl(Ice::InputStream*) {} }; @@ -67,7 +66,7 @@ public: std::shared_ptr<T> ice_clone() const { - return std::static_pointer_cast<T>(cloneImpl()); + return std::static_pointer_cast<T>(_iceCloneImpl()); } virtual std::string ice_id() const override @@ -77,7 +76,7 @@ public: protected: - virtual std::shared_ptr<Value> cloneImpl() const override + virtual std::shared_ptr<Value> _iceCloneImpl() const override { return std::make_shared<T>(static_cast<const T&>(*this)); } |