From aa8c937ca12669364c828c714ad3e0dd3a707f8c Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Fri, 25 Jul 2014 18:18:11 +0200
Subject: Fixed #3 of ICE-5594: fixed __verify signature to take a const& for
 the cookie

---
 cpp/src/Ice/OutgoingAsync.cpp | 6 +++---
 cpp/src/Ice/Proxy.cpp         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cpp/src')

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;
 }
-- 
cgit v1.2.3