1 files changed, 17 insertions, 32 deletions

diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 78817e266f0..561ddb683bb 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -44,33 +44,30 @@ namespace TAO
 
     void
     Cached_Policies::update (TAO_POA_Policy_Set &policy_set
-                                     ACE_ENV_ARG_DECL)
+                                     )
     {
       for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
         {
           CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
 
           this->update_policy (policy.in ()
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                              );
         }
     }
 
     void
     Cached_Policies::update_policy (const CORBA::Policy_ptr policy
-                                    ACE_ENV_ARG_DECL)
+                                    )
     {
 
     #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
       ::PortableServer::ThreadPolicy_var thread
         = ::PortableServer::ThreadPolicy::_narrow (policy
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                  );
 
       if (!CORBA::is_nil (thread.in ()))
         {
-          this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->thread_ = thread->value ();
 
           return;
         }
@@ -79,13 +76,11 @@ namespace TAO
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::LifespanPolicy_var lifespan
         = ::PortableServer::LifespanPolicy::_narrow (policy
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                    );
 
       if (!CORBA::is_nil (lifespan.in ()))
         {
-          this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->lifespan_ = lifespan->value ();
 
           return;
         }
@@ -94,13 +89,11 @@ namespace TAO
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::IdUniquenessPolicy_var id_uniqueness
         = ::PortableServer::IdUniquenessPolicy::_narrow (policy
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                        );
 
       if (!CORBA::is_nil (id_uniqueness.in ()))
         {
-          this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_uniqueness_ = id_uniqueness->value ();
 
           return;
         }
@@ -109,13 +102,11 @@ namespace TAO
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::IdAssignmentPolicy_var id_assignment
         = ::PortableServer::IdAssignmentPolicy::_narrow (policy
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                        );
 
       if (!CORBA::is_nil (id_assignment.in ()))
         {
-          this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_assignment_ = id_assignment->value ();
 
           return;
         }
@@ -125,39 +116,33 @@ namespace TAO
 
       ::PortableServer::ImplicitActivationPolicy_var implicit_activation
         = ::PortableServer::ImplicitActivationPolicy::_narrow (policy
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                              );
 
       if (!CORBA::is_nil (implicit_activation.in ()))
         {
-          this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->implicit_activation_ = implicit_activation->value ();
 
           return;
         }
 
       ::PortableServer::ServantRetentionPolicy_var servant_retention
         = ::PortableServer::ServantRetentionPolicy::_narrow (policy
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                            );
 
       if (!CORBA::is_nil (servant_retention.in ()))
         {
-          this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->servant_retention_ = servant_retention->value ();
 
           return;
         }
 
       ::PortableServer::RequestProcessingPolicy_var request_processing
         = ::PortableServer::RequestProcessingPolicy::_narrow (policy
-                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                             );
 
       if (!CORBA::is_nil (request_processing.in ()))
         {
-          this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->request_processing_ = request_processing->value ();
 
           return;
         }