diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
| commit | a4f93259dc3494d98addf38e69b87eb557d432b3 (patch) | |
| tree | d2b78bb5cea24e33dc1b46be22dba6167e96c9ed /cpp/src/IceGrid/AdminCallbackRouter.cpp | |
| parent | Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff) | |
| download | ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2 ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip | |
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'cpp/src/IceGrid/AdminCallbackRouter.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdminCallbackRouter.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp index 24030efaedf..8f3f3aea72e 100644 --- a/cpp/src/IceGrid/AdminCallbackRouter.cpp +++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp @@ -13,17 +13,18 @@ using namespace Ice; using namespace std; void -IceGrid::AdminCallbackRouter::invokeResponse(bool ok, const std::pair<const Byte*, const Byte*>& outParams, - const InvokeCookiePtr& cookie) +IceGrid::AdminCallbackRouter::invokeResponse(bool ok, + const std::pair<const Byte*, const Byte*>& outParams, + const AMD_Object_ice_invokePtr& amdCB) { - cookie->cb()->ice_response(ok, outParams); + amdCB->ice_response(ok, outParams); } void -IceGrid::AdminCallbackRouter::invokeException(const Ice::Exception&, const InvokeCookiePtr& cookie) +IceGrid::AdminCallbackRouter::invokeException(const Ice::Exception&, const AMD_Object_ice_invokePtr& amdCB) { // Callback object is unreachable. - cookie->cb()->ice_exception(ObjectNotExistException(__FILE__, __LINE__)); + amdCB->ice_exception(ObjectNotExistException(__FILE__, __LINE__)); } void @@ -79,10 +80,9 @@ IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& c // Call with AMI // target->begin_ice_invoke(current.operation, current.mode, inParams, current.ctx, - newCallback_Object_ice_invoke( - this, - &AdminCallbackRouter::invokeResponse, - &AdminCallbackRouter::invokeException), - new InvokeCookie(cb)); + newCallback_Object_ice_invoke(this, + &AdminCallbackRouter::invokeResponse, + &AdminCallbackRouter::invokeException), + cb); } |