1 files changed, 26 insertions, 59 deletions

diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 217eacdae41..2670017a27f 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -32,39 +32,29 @@ Policy_Tester::~Policy_Tester (void)
 }
 
 void
-Policy_Tester::run (ACE_ENV_SINGLE_ARG_DECL)
+Policy_Tester::run (void)
 {
   PortableServer::POAManager_var poa_manager =
-    this->child_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->child_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->run ();
 }
 
 int
 Policy_Tester::init (int argc,
-                     char *argv[]
-                     ACE_ENV_ARG_DECL)
+                     char *argv[])
 {
   // ORB Initialization.
   this->orb_ =
-    CORBA::ORB_init (argc, argv, ""
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ORB_init (argc, argv, "");
 
   // Get a reference to the RT-ORB.
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTORB"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RTORB");
 
-  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ());
 
   // Here we parse the command line paramether passed
   // to the application.
@@ -78,14 +68,12 @@ Policy_Tester::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RT_Properties::read_from (arg);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RT_Properties::read_from (arg);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
         {
@@ -95,7 +83,6 @@ Policy_Tester::init (int argc,
                                 RT_Properties,
                                 CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (-1);
             }
           this->rt_poa_properties_->ior_source (arg);
         }
@@ -107,7 +94,6 @@ Policy_Tester::init (int argc,
                                 RT_Properties,
                                 CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (-1);
             }
           this->rt_object_properties_->ior_source (arg);
         }
@@ -123,8 +109,7 @@ Policy_Tester::init (int argc,
     }
 
   int result =
-    this->create_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->create_objects ();
 
   if (result != 0)
     return result;
@@ -146,7 +131,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 
 
 int
-Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
+Policy_Tester::create_objects (void)
 {
   CORBA::PolicyList poa_policy_list;
   poa_policy_list.length (3);
@@ -155,18 +140,14 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   RTCORBA::Priority priority = this->rt_poa_properties_->priority ();
   poa_policy_list[0] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                                 priority
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                 priority);
 
       // Create priority Banded Connection Policy.
   RTCORBA::PriorityBands poa_priority_bands =
     this->rt_poa_properties_->priority_bands ();
 
   poa_policy_list[1] =
-    this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands
-                                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands);
 
       // Client Protocol Policy.
   RTCORBA::ProtocolList protocol_list;
@@ -184,12 +165,10 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
     this->rt_orb_->create_client_protocol_policy (protocol_list);
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (object.in ());
 
   PortableServer::POAManager_var poa_mgr =
     PortableServer::POAManager::_nil ();
@@ -197,20 +176,15 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   object =
     this->poa_->create_POA ("Child_POA",
                             poa_mgr.in (),
-                            poa_policy_list
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            poa_policy_list);
 
   this->child_poa_ =
-    RTPortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTPortableServer::POA::_narrow (object.in ());
 
   // Create a Corba Object reference, using the policies
   // set at the POA level.
   object =
-    this->child_poa_->create_reference ("IDL:Counter:1.0"
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->child_poa_->create_reference ("IDL:Counter:1.0");
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Reference Created!\n")));
@@ -219,16 +193,14 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
                         "Unable to create Object!\n"))
     return -1;
 
-  Counter_var base_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Counter_var base_object = Counter::_narrow (object.in ());
 
   if (!check_reference (base_object.in(),
                         "Unable to create a Object!\n"))
     return -1;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (base_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (base_object.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Activated as <%s>\n"), ior.in ()));
@@ -252,9 +224,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   object =
     this->child_poa_->create_reference_with_priority
     ("IDL:Counter:1.0",
-     this->rt_object_properties_->priority ()
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+     this->rt_object_properties_->priority ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Reference Created!\n")));
@@ -263,8 +233,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
                         "Unable to create a Counter Object!\n"))
     return -1;
 
-  Counter_var over_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Counter_var over_object = Counter::_narrow (object.in ());
 
   if (!check_reference (over_object.in(),
                         "Unable to create Object!\n"))
@@ -272,8 +241,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
 
 
   CORBA::String_var o_ior =
-    this->orb_->object_to_string (over_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (over_object.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Activated as <%s>\n"), o_ior.in ()));
@@ -291,8 +259,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Policy_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Policy_Tester::shutdown (void)
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }