diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-25 18:18:11 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-25 18:18:11 +0200 |
| commit | aa8c937ca12669364c828c714ad3e0dd3a707f8c (patch) | |
| tree | ad4d2d7eaa1fdef35cbf3d48cedb1fb6bb0e7008 /cpp/src | |
| parent | Fixed ICE-5595: Catch C++ exceptions by const reference (diff) | |
| download | ice-aa8c937ca12669364c828c714ad3e0dd3a707f8c.tar.bz2 ice-aa8c937ca12669364c828c714ad3e0dd3a707f8c.tar.xz ice-aa8c937ca12669364c828c714ad3e0dd3a707f8c.zip | |
Fixed #3 of ICE-5594: fixed __verify signature to take a const& for the cookie
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 17095659df5..905b3196a5f 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -111,7 +111,7 @@ Ice::AsyncResult::AsyncResult(const CommunicatorPtr& communicator, { throw IceUtil::IllegalArgumentException(__FILE__, __LINE__); } - const_cast<CallbackBasePtr&>(_callback) = _callback->__verify(const_cast<LocalObjectPtr&>(_cookie)); + const_cast<CallbackBasePtr&>(_callback) = _callback->__verify(_cookie); } Ice::AsyncResult::~AsyncResult() @@ -1150,7 +1150,7 @@ public: assert(false); } - virtual CallbackBasePtr __verify(Ice::LocalObjectPtr&) + virtual CallbackBasePtr __verify(const Ice::LocalObjectPtr&) { // // Called by the AsyncResult constructor to verify the delegate. The dummy @@ -1205,7 +1205,7 @@ Ice::newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>& co _completed(result); } - virtual CallbackBasePtr __verify(LocalObjectPtr&) + virtual CallbackBasePtr __verify(const LocalObjectPtr&) { return this; // Nothing to do, the cookie is not type-safe. } diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 3e9dd5ae420..b872b1f0477 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -80,7 +80,7 @@ IceInternal::Cpp11FnCallbackNC::Cpp11FnCallbackNC(const ::std::function<void (co } IceInternal::CallbackBasePtr -IceInternal::Cpp11FnCallbackNC::__verify(::Ice::LocalObjectPtr&) +IceInternal::Cpp11FnCallbackNC::__verify(const ::Ice::LocalObjectPtr&) { return this; } |