diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-07 12:26:35 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-07 12:26:35 +0200 |
| commit | 297a96cd7db80d8b5076ce671b52861caa51a5cc (patch) | |
| tree | 53a85b2104ec3ce6dfd1640765ac1a8e0ad762f7 | |
| parent | Fixed ICE-5488: C# transport leak (diff) | |
| download | ice-297a96cd7db80d8b5076ce671b52861caa51a5cc.tar.bz2 ice-297a96cd7db80d8b5076ce671b52861caa51a5cc.tar.xz ice-297a96cd7db80d8b5076ce671b52861caa51a5cc.zip | |
Fixed ICE-5394: removed deprecated C++ ice_getHash method
| -rw-r--r-- | cpp/include/Ice/LocalObject.h | 8 | ||||
| -rw-r--r-- | cpp/include/Ice/Proxy.h | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/LocalObject.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 6 |
4 files changed, 0 insertions, 21 deletions
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h index ae73f6090c9..8ec861ac882 100644 --- a/cpp/include/Ice/LocalObject.h +++ b/cpp/include/Ice/LocalObject.h @@ -29,14 +29,6 @@ public: virtual bool operator==(const LocalObject&) const; virtual bool operator<(const LocalObject&) const; - ICE_DEPRECATED_API("is deprecated") ::Ice::Int ice_getHash() const - { - return internal_getHash(); - } - -protected: - - virtual ::Ice::Int internal_getHash() const; }; } diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index e5cc1e595ee..212fe0a1ef3 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -232,8 +232,6 @@ public: bool operator!=(const Object&) const; bool operator<(const Object&) const; - ICE_DEPRECATED_API("is deprecated") ::Ice::Int ice_getHash() const; - ::Ice::CommunicatorPtr ice_getCommunicator() const; ::std::string ice_toString() const; diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp index e444ab929f2..b1845365ee0 100644 --- a/cpp/src/Ice/LocalObject.cpp +++ b/cpp/src/Ice/LocalObject.cpp @@ -27,8 +27,3 @@ Ice::LocalObject::operator<(const LocalObject& r) const return this < &r; } -Int -Ice::LocalObject::internal_getHash() const -{ - return static_cast<Int>(reinterpret_cast<Long>(this) >> 4); -} diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 8f4273a58ab..d4468b6cb2c 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -108,12 +108,6 @@ IceProxy::Ice::Object::operator<(const Object& r) const return _reference < r._reference; } -Int -IceProxy::Ice::Object::ice_getHash() const -{ - return _reference->hash(); -} - CommunicatorPtr IceProxy::Ice::Object::ice_getCommunicator() const { |