summaryrefslogtreecommitdiff
path: root/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h')
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 9d8c758122a..d0f0c5edb1e 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -44,8 +44,8 @@ public:
/// Dispatch the request to the servant.
virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
- TAO_ServerRequest &req,
- CORBA::Environment &ACE_TRY_ENV);
+ TAO_ServerRequest &req
+ TAO_ENV_ARG_DECL);
/// Factory method for creating new POA's.
virtual TAO_POA *create_POA (const ACE_CString &name,
@@ -55,8 +55,8 @@ public:
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
TAO_ORB_Core &orb_core,
- TAO_Object_Adapter *object_adapter,
- CORBA_Environment &ACE_TRY_ENV);
+ TAO_Object_Adapter *object_adapter
+ TAO_ENV_ARG_DECL);
};
/**
@@ -93,12 +93,12 @@ public:
// current thread, and sets the thread to the client-propagated
// priority.
void pre_invoke (TAO_Service_Context &request_service_context,
- TAO_Service_Context &reply_service_context,
- CORBA::Environment &ACE_TRY_ENV);
+ TAO_Service_Context &reply_service_context
+ TAO_ENV_ARG_DECL);
// Resets the priority of the current thread back to its original
// value, if necessary.
- void post_invoke (CORBA::Environment &ACE_TRY_ENV);
+ void post_invoke (TAO_ENV_SINGLE_ARG_DECL);
private: