1 files changed, 37 insertions, 89 deletions

diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index a0ae68a61ce..44e08a0c106 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -172,22 +172,20 @@ DT_Creator::init (int argc, char *argv [])
 }
 
 void
-DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::register_synch_obj (void)
 {
   CosNaming::Name name (1);
   name.length (1);
 
   CosNaming::NamingContext_var synch_context;
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup ("Synch");
 
-      synch_context = this->naming_->bind_new_context (name
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      synch_context = this->naming_->bind_new_context (name);
 
       //
       // We reach here if there was no exception raised in
@@ -195,7 +193,7 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
       //
 
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& )
     {
       //
       // The synch context already exists, probably created by the
@@ -207,15 +205,11 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
         CORBA::string_dup ("Synch");
 
       CORBA::Object_var object =
-        this->naming_->resolve (name
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_->resolve (name);
 
       synch_context = CosNaming::NamingContext::_narrow (object.in ());
 
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_CString synch_name ("Synch");
   ACE_Time_Value timestamp = ACE_OS::gettimeofday ();
@@ -233,43 +227,34 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW (synch_,
      Synch_i);
 
-  Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Synch_var synch = synch_->_this ();
 
   // Register the synch object with the Synch context.
   synch_context->rebind (name,
-       synch.in ()
-       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+       synch.in ());
 
 }
 
 
 int
-DT_Creator::activate_root_poa (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_root_poa (void)
 {
   CORBA::Object_var object =
-    orb_->resolve_initial_references ("RootPOA"
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RootPOA");
 
   root_poa_ =
-    PortableServer::POA::_narrow (object.in ()
-          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   return 0;
 }
 
 void
-DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_poa_list (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -278,26 +263,20 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
   if (poa_count_ > 0)
     {
       CORBA::Object_var object =
-  orb_->resolve_initial_references ("RTORB"
-            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+  orb_->resolve_initial_references ("RTORB");
 
       this->rt_orb_ =
-  RTCORBA::RTORB::_narrow (object.in ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+  RTCORBA::RTORB::_narrow (object.in ());
     }
 
   for (int i = 0; i < poa_count_; ++i)
     {
-      poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in ()
-            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in ());
     }
 }
 
 void
-DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_job_list (void)
 {
 
   if (TAO_debug_level > 0)
@@ -315,40 +294,28 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 
       // find your poa
       PortableServer::POA_var host_poa =
-        root_poa_->find_POA (job->poa ().c_str (), 0
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        root_poa_->find_POA (job->poa ().c_str (), 0);
 
       PortableServer::ServantBase_var servant_var (job);
 
       // Register with poa.
       PortableServer::ObjectId_var id;
 
-      id = host_poa->activate_object (job
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      id = host_poa->activate_object (job);
 
       CORBA::Object_var server =
-        host_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        host_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb_->object_to_string (server.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        orb_->object_to_string (server.in ());
 
       const ACE_CString &job_name = job->name ();
 
       CosNaming::Name_var name =
-        this->naming_->to_name (job_name.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_->to_name (job_name.c_str ());
 
       this->naming_->rebind (name.in (),
-                             server.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             server.in ());
 
 
     } /* while */
@@ -358,7 +325,7 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_schedule (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -379,25 +346,19 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
     name[0].id = CORBA::string_dup (task->job ());
 
     CORBA::Object_var obj =
-      this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->naming_->resolve (name);
 
-    Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Job_var job = Job::_narrow (obj.in ());
 
     //    if (TAO_debug_level > 0)
     // {
         // Check that the object is configured with some
         // PriorityModelPolicy.
         CORBA::Policy_var policy =
-    job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+    job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
         RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
         if (CORBA::is_nil (priority_policy.in ()))
     ACE_DEBUG ((LM_DEBUG,
@@ -406,8 +367,7 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
     {
                   /*
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        priority_policy->priority_model ();
 
       if (priority_model == RTCORBA::CLIENT_PROPAGATED)
         ACE_DEBUG ((LM_DEBUG,
@@ -430,12 +390,10 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
@@ -444,9 +402,7 @@ DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
   //@@tmp hack, otherwise crashes on exit!..??
   CosNaming::NamingContextExt::_duplicate (this->naming_.in());
@@ -454,8 +410,7 @@ DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
-            ACE_ENV_ARG_DECL)
+DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current)
 {
   current_ = RTScheduling::Current::_duplicate (current);
 
@@ -470,8 +425,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
 
   while (!this->synch ()->synched ())
     {
-      this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->perform_work ();
     }
 
   CORBA::Policy_var sched_param;
@@ -479,9 +433,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
   const char * name = 0;
   current_->begin_scheduling_segment (name,
               sched_param.in (),
-              sched_param.in ()
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+              sched_param.in ());
 
   ACE_NEW (base_time_,
      ACE_Time_Value (*(this->synch ()->base_time ())));
@@ -517,17 +469,13 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
       dt_list_ [i]->activate_task (current,
            sched_param.in (),
            flags,
-           base_time_
-           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+           base_time_);
 
     }
 
   this->wait ();
 
-  current_->end_scheduling_segment (name
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  current_->end_scheduling_segment (name);
 
   this->check_ifexit ();
 }