Fixed #3 of ICE-5594: fixed __verify signature to take a const& for the cookie

4 files changed, 9 insertions, 9 deletions

diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index c432663c966..4d44549e604 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -397,7 +397,7 @@ public:
     }
 
     virtual void __completed(const ::Ice::AsyncResultPtr&) const = 0;
-    virtual CallbackBasePtr __verify(::Ice::LocalObjectPtr&) = 0;
+    virtual CallbackBasePtr __verify(const ::Ice::LocalObjectPtr&) = 0;
     virtual void __sent(const ::Ice::AsyncResultPtr&) const = 0;
     virtual bool __hasSentCallback() const = 0;
 };
@@ -434,7 +434,7 @@ public:
         (callback.get()->*completed)(result);
     }
 
-    virtual CallbackBasePtr __verify(::Ice::LocalObjectPtr&)
+    virtual CallbackBasePtr __verify(const ::Ice::LocalObjectPtr&)
     {
         return this; // Nothing to do, the cookie is not type-safe.
     }
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 0155efadbf0..c889003cc1b 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -161,7 +161,7 @@ public:
     Cpp11FnCallbackNC(const ::std::function<void (const ::Ice::Exception&)>&,
                       const ::std::function<void (bool)>&);
 
-    virtual CallbackBasePtr __verify(::Ice::LocalObjectPtr&);
+    virtual CallbackBasePtr __verify(const ::Ice::LocalObjectPtr&);
 
     virtual void __sent(const ::Ice::AsyncResultPtr&) const;
  
@@ -1300,7 +1300,7 @@ public:
     {
     }
 
-    virtual CallbackBasePtr __verify(::Ice::LocalObjectPtr& cookie)
+    virtual CallbackBasePtr __verify(const ::Ice::LocalObjectPtr& cookie)
     {
         if(cookie != 0) // Makes sure begin_ was called without a cookie
         {
@@ -1354,7 +1354,7 @@ public:
     {
     }
 
-    virtual CallbackBasePtr __verify(::Ice::LocalObjectPtr& cookie)
+    virtual CallbackBasePtr __verify(const ::Ice::LocalObjectPtr& cookie)
     {
         if(cookie && !CT::dynamicCast(cookie))
         {
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;
 }