diff options
Diffstat (limited to 'TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp')
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp index 4f3552e9f9f..31c3f6c82f6 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp @@ -16,8 +16,8 @@ ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$") #endif /* ! __ACE_INLINE__ */ CORBA::Boolean -TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object, - CORBA::Environment &ACE_TRY_ENV) const +TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object + TAO_ENV_ARG_DECL) const { // Make sure that the servant is in the same ORB that created this // object. @@ -32,8 +32,8 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object, // until <servant_upcall> dies. TAO_Object_Adapter::Servant_Upcall servant_upcall (orb_core); TAO_POA *poa = - servant_upcall.lookup_POA (object->_object_key (), - ACE_TRY_ENV); + servant_upcall.lookup_POA (object->_object_key () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the thread pool associated with this POA. @@ -95,8 +95,8 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object, poa->locate_servant_i ("operation not used", servant_upcall.system_id_, servant_upcall, - servant_upcall.current_context_, - ACE_TRY_ENV); + servant_upcall.current_context_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the priority that the servant will run at. |