1 files changed, 44 insertions, 44 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 7c7f450d024..cdebf4d772f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -100,7 +100,7 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
               TAO_CHECK_ENV;
 
               poa->deactivate_object (id.in (), TAO_TRY_ENV);
-              TAO_CHECK_ENV;
+              TAO_CHECK_ENV;              
             }
           TAO_CATCHANY
             {
@@ -135,36 +135,36 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 }
 
 template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Trader_Components<IF>::lookup_if (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Trader_Components<IF>::register_if (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Trader_Components<IF>::admin_if (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Trader_Components<IF>::proxy_if (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Trader_Components<IF>::link_if (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
 }
@@ -176,29 +176,29 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_proxy_offers ();
 }
 
 template <class IF> CosTrading::TypeRepository_ptr
-TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
 }
@@ -211,78 +211,78 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::max_list (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment&)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_follow_policy ();
 }
@@ -295,8 +295,8 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &env)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_link_follow_policy ();
 }
@@ -317,7 +317,7 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
     {
       CORBA::ULong length = dyn_seq.length (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       for (CORBA::ULong i = 0; i < length && ! return_value; i++)
         {
           if (functor (dyn_seq, element))