1 files changed, 30 insertions, 30 deletions

diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp
index 0ae3a1f8db0..db15d875142 100644
--- a/TAO/tao/MessagingS_T.cpp
+++ b/TAO/tao/MessagingS_T.cpp
@@ -24,140 +24,140 @@
 #endif /* !defined INLINE */
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RebindPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RebindPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RebindPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RebindPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::SyncScopePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::SyncScopePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->SyncScopePolicy::_default_POA (ACE_TRY_ENV);
+  return this->SyncScopePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RequestPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RequestPriorityPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RequestPriorityPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyPriorityPolicy::_default_POA (ACE_TRY_ENV);
+  return this->ReplyPriorityPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RequestStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RequestStartTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->RequestStartTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RequestEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RequestEndTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->RequestEndTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyStartTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->ReplyStartTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyEndTimePolicy::_default_POA (ACE_TRY_ENV);
+  return this->ReplyEndTimePolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RelativeRequestTimeoutPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RelativeRequestTimeoutPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RelativeRoundtripTimeoutPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RelativeRoundtripTimeoutPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::RoutingPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::RoutingPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->RoutingPolicy::_default_POA (ACE_TRY_ENV);
+  return this->RoutingPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::MaxHopsPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::MaxHopsPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->MaxHopsPolicy::_default_POA (ACE_TRY_ENV);
+  return this->MaxHopsPolicy::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->QueueOrderPolicy::_default_POA (ACE_TRY_ENV);
+  return this->QueueOrderPolicy::_default_POA (env);
 }
 
 #if defined (TAO_POLLER)
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyHandler::_default_POA (ACE_TRY_ENV);
+  return this->ReplyHandler::_default_POA (env);
 }
 
 template <class T> PortableServer::POA_ptr
-POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &env)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->Poller::_default_POA (ACE_TRY_ENV);
+  return this->Poller::_default_POA (env);
 }
 #endif /* TAO_POLLER */