Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

30 files changed, 70 insertions, 211 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index ffaf522468e..f4b283bc00c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -60,7 +60,7 @@ TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void)
 }
 
 CosLoadBalancing::Location *
-TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Load_Average_Monitor::the_location (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
@@ -71,13 +71,12 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return location;
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Load_Average_Monitor::loads (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
@@ -221,7 +220,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var load_list = tmp;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 48a8267e189..e1627c2b007 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -110,7 +110,7 @@ TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void)
 }
 
 CosLoadBalancing::Location *
-TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Utilization_Monitor::the_location (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
@@ -121,13 +121,12 @@ TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return location;
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Utilization_Monitor::loads (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
@@ -145,7 +144,6 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var load_list = tmp;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index abfe60c3f23..52cd589b7b7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -37,13 +37,11 @@ TAO_LB_ClientComponent::register_orb_initializer (void)
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 10ef40d2a54..664f0aa669b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -31,13 +31,11 @@ TAO_LB_ClientORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor = tmp;
 
   info->add_client_request_interceptor (client_interceptor.in ()
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index 870a88577d2..b6169e415f3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -18,7 +18,7 @@ TAO_LB_ClientRequestInterceptor::name (
 }
 
 void
-TAO_LB_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ClientRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -31,8 +31,7 @@ TAO_LB_ClientRequestInterceptor::send_request (
                    PortableInterceptor::ForwardRequest))
 {
   /*
-  CORBA::Object_var t = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var t = ri->target ();
   */
 
   // A ServiceContext with an empty payload (i.e. zero length
@@ -74,7 +73,6 @@ TAO_LB_ClientRequestInterceptor::send_request (
   ri->add_request_service_context (service_context,
                                    replace
                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 124a845a989..19c5318134a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -68,10 +68,10 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 3e6d76a10aa..2f90d572291 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -113,13 +113,11 @@ TAO_LB_Component::register_orb_initializer (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 3f555d17a5c..51f6c4e2090 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -30,14 +30,14 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
 }
 
 char *
-TAO_LB_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_IORInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_IORInterceptor");
 }
 
 void
-TAO_LB_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_IORInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Force the LoadManager reference to be released since the ORB's
@@ -64,12 +64,10 @@ TAO_LB_IORInterceptor::components_established (
                                         0,
                                         this->orb_id_.in ()
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   // Save a copy of the current ObjectReferenceFactory.
   PortableInterceptor::ObjectReferenceFactory_var old_orf =
-    info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->current_factory ();
 
   PortableInterceptor::ObjectReferenceFactory * tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -84,13 +82,11 @@ TAO_LB_IORInterceptor::components_established (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ObjectReferenceFactory_var orf = tmp;
 
   info->current_factory (orf.in ()
                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -102,8 +98,7 @@ TAO_LB_IORInterceptor::adapter_manager_state_changed (
 {
   if (state == PortableInterceptor::ACTIVE)
     {
-      this->register_load_alert (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->register_load_alert ();
     }
 }
 
@@ -116,13 +111,12 @@ TAO_LB_IORInterceptor::adapter_state_changed (
 {
   if (state == PortableInterceptor::ACTIVE)
     {
-      this->register_load_alert (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->register_load_alert ();
     }
 }
 
 void
-TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_IORInterceptor::register_load_alert (void)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
@@ -136,7 +130,7 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
       // By now, the RootPOA has been fully initialized, so it is safe
       // to activate the LoadAlert object.
       CosLoadBalancing::LoadAlert_var la =
-        this->load_alert_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->load_alert_._this ();
       ACE_TRY_CHECK_EX (foo);
 
       {
@@ -153,7 +147,6 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
                              "LoadAlert::_this()");
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_TRY
     {
@@ -164,7 +157,6 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
       this->lm_->register_load_alert (location,
                                       this->la_ref_.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCH (CosLoadBalancing::LoadAlertAlreadyPresent, ex)
     {
@@ -183,7 +175,6 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TRY_THROW (CORBA::INTERNAL ());
     }
   ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 6b93c951912..ded72a5e5f6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -71,11 +71,11 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the tagged components to the IOR.
@@ -112,7 +112,7 @@ public:
 private:
 
   /// Create and register the LoadAlert object with the LoadManager.
-  void register_load_alert (ACE_ENV_SINGLE_ARG_DECL);
+  void register_load_alert (void);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 00c4fa6203d..cc06f8ac8d2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -53,14 +53,14 @@ TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void)
 }
 
 char *
-TAO_LB_LeastLoaded::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LeastLoaded::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LeastLoaded");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LeastLoaded::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -71,7 +71,6 @@ TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -167,13 +166,11 @@ TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
   CosLoadBalancing::LoadList_var loads =
     load_manager->get_loads (the_location
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   this->push_loads (the_location,
                     loads.in (),
                     loads[0]
                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   return loads._retn ();
 }
@@ -195,7 +192,6 @@ TAO_LB_LeastLoaded::next_member (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -210,7 +206,6 @@ TAO_LB_LeastLoaded::next_member (
                         locations.in (),
                         location
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (found_location)
     {
@@ -254,7 +249,6 @@ TAO_LB_LeastLoaded::analyze_loads (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (locations->length () == 0)
     ACE_THROW (CORBA::TRANSIENT ());
@@ -275,14 +269,12 @@ TAO_LB_LeastLoaded::analyze_loads (
           CosLoadBalancing::LoadList_var current_loads =
             load_manager->get_loads (loc
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
                             load
                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 /*
            ACE_DEBUG ((LM_DEBUG,
                        "EFFECTIVE_LOAD == %f\n"
@@ -313,7 +305,6 @@ TAO_LB_LeastLoaded::analyze_loads (
                   // LoadManager.
                   load_manager->enable_alert (loc
                                               ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
                 }
               else
                 {
@@ -321,7 +312,6 @@ TAO_LB_LeastLoaded::analyze_loads (
                   // shedding at given location.
                   load_manager->disable_alert (loc
                                                ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
                 }
             }
         }
@@ -331,12 +321,11 @@ TAO_LB_LeastLoaded::analyze_loads (
           // next location.
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 PortableServer::POA_ptr
-TAO_LB_LeastLoaded::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LeastLoaded::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -370,7 +359,6 @@ TAO_LB_LeastLoaded::get_location (
           CosLoadBalancing::LoadList_var current_loads =
             load_manager->get_loads (loc
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           found_load = 1;
 
@@ -379,7 +367,6 @@ TAO_LB_LeastLoaded::get_location (
                             current_loads.in (),
                             load
                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 /*
            ACE_DEBUG ((LM_DEBUG,
                        "LOC = %u"
@@ -496,7 +483,6 @@ TAO_LB_LeastLoaded::get_location (
           // next location.
         }
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
 //   ACE_DEBUG ((LM_DEBUG,
@@ -547,7 +533,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         critical_threshold
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           ct = &property;
         }
@@ -558,7 +543,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         reject_threshold
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
@@ -567,7 +551,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         tolerance
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
@@ -581,7 +564,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         dampening
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
@@ -595,7 +577,6 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         per_balance_load
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index a7843028c66..3c79ae6a5b8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -87,7 +87,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index a57212dbce6..56b62f8a780 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -22,7 +22,7 @@ TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
 }
 
 void
-TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert::enable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
@@ -31,7 +31,7 @@ TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_LB_LoadAlert::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert::disable_alert (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index f5345ef7f07..d4f2ecb6ddc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -43,11 +43,11 @@ public:
 
   /// Forward requests back to the load manager via the object group
   /// reference.
-  virtual void enable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void enable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Stop forwarding requests, and begin accepting them again.
-  virtual void disable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -64,7 +64,7 @@ public:
    * reference counting.
    */
   virtual ~TAO_LB_LoadAlert (void);
-  
+
 private:
 
   /// Has this LoadAlert servant been alerted of a high load condition
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index ca2bf1b5116..f85bbc721fa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -14,7 +14,7 @@ TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
 }
 
 void
-TAO_LB_LoadAlert_Handler::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert_Handler::enable_alert (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -32,7 +32,7 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep (
 }
 
 void
-TAO_LB_LoadAlert_Handler::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert_Handler::disable_alert (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index d19518ce96d..15a7c1c7e30 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -43,7 +43,7 @@ class TAO_LB_LoadAlert_Handler
 {
 public:
 
-  virtual void enable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void enable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void enable_alert_excep (
@@ -51,7 +51,7 @@ public:
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void disable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disable_alert_excep (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index c6a0d0c3fa3..ab0d9693771 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -51,14 +51,14 @@ TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void)
 }
 
 char *
-TAO_LB_LoadAverage::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAverage::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadAverage");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadAverage::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -69,7 +69,6 @@ TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -165,13 +164,11 @@ TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
   CosLoadBalancing::LoadList_var loads =
     load_manager->get_loads (the_location
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   this->push_loads (the_location,
                     loads.in (),
                     loads[0]
                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   return loads._retn ();
 }
@@ -193,7 +190,6 @@ TAO_LB_LoadAverage::next_member (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -221,7 +217,6 @@ TAO_LB_LoadAverage::analyze_loads (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (locations->length () == 0)
     ACE_THROW (CORBA::TRANSIENT ());
@@ -248,14 +243,12 @@ TAO_LB_LoadAverage::analyze_loads (
           CosLoadBalancing::LoadList_var current_loads =
             load_manager->get_loads (loc
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
                             load
                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           // @@ Jai, please use the compound "+=" operator here.  It
           //    is more efficient in this case.
@@ -275,7 +268,6 @@ TAO_LB_LoadAverage::analyze_loads (
           //
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   avg_load.value = total_load.value / len;
@@ -360,13 +352,12 @@ TAO_LB_LoadAverage::analyze_loads (
           //
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 
 }
 
 PortableServer::POA_ptr
-TAO_LB_LoadAverage::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAverage::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -389,7 +380,6 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         tolerance
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
@@ -403,7 +393,6 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         dampening
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
@@ -417,7 +406,6 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         per_balance_load
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 4af286ee527..b2fb8a4d9f8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -69,7 +69,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 10b42090791..30fd71fe937 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -93,7 +93,6 @@ TAO_LB_LoadManager::push_loads (
   PortableGroup::ObjectGroups_var groups =
     this->object_group_manager_.groups_at_location (the_location
                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   const CORBA::ULong len = groups->length ();
 
@@ -107,7 +106,6 @@ TAO_LB_LoadManager::push_loads (
           PortableGroup::Properties_var properties =
             this->get_properties (object_group
                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           PortableGroup::Value value;
           CosLoadBalancing::Strategy_ptr strategy;
@@ -126,7 +124,6 @@ TAO_LB_LoadManager::push_loads (
               strategy->analyze_loads (object_group,
                                        this->lm_ref_.in ()
                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
             }
         }
       ACE_CATCHANY
@@ -134,7 +131,6 @@ TAO_LB_LoadManager::push_loads (
           // Ignore all exceptions.
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
@@ -152,7 +148,6 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var loads = tmp;
 
@@ -218,7 +213,6 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location
         // member selection.
         load_alert->sendc_enable_alert (this->load_alert_handler_.in ()
                                         ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
       }
     }
   else
@@ -275,7 +269,6 @@ TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location
         // member selection.
         load_alert->sendc_disable_alert (this->load_alert_handler_.in ()
                                          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
       }
     }
   else
@@ -353,7 +346,6 @@ TAO_LB_LoadManager::remove_load_alert (
   // object is no longer under the control of the LoadManager.
   this->disable_alert (the_location
                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
@@ -491,7 +483,6 @@ TAO_LB_LoadManager::set_default_properties (
   PortableGroup::Properties new_props (props);
   this->preprocess_properties (new_props
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->property_manager_.set_default_properties (new_props
                                                   ACE_ENV_ARG_PARAMETER);
@@ -531,7 +522,6 @@ TAO_LB_LoadManager::set_type_properties (
   PortableGroup::Properties new_overrides (overrides);
   this->preprocess_properties (new_overrides
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->property_manager_.set_type_properties (type_id,
                                                new_overrides
@@ -576,7 +566,6 @@ TAO_LB_LoadManager::set_properties_dynamically (
   PortableGroup::Properties new_overrides (overrides);
   this->preprocess_properties (new_overrides
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   this->property_manager_.set_properties_dynamically (object_group,
                                                       new_overrides
@@ -739,21 +728,18 @@ TAO_LB_LoadManager::create_object (
                    PortableGroup::InvalidProperty,
                    PortableGroup::CannotMeetCriteria))
 {
-//   this->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::Object::_nil ());
+//   this->init ();
 
 
   PortableGroup::Criteria new_criteria (the_criteria);
   this->preprocess_properties (new_criteria
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   CORBA::Object_ptr obj =
     this->generic_factory_.create_object (type_id,
                                           new_criteria,
                                           factory_creation_id
                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
 
   return obj;
@@ -837,7 +823,6 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
   PortableGroup::Properties_var properties =
     this->get_properties (object_group.in ()
                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Prefer custom load balancing strategies over built-in ones.
   PortableGroup::Value value;
@@ -886,7 +871,6 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       PortableServer::ServantManager_var member_locator = tmp;
 
@@ -897,13 +881,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
         root_poa->create_request_processing_policy (
           PortableServer::USE_SERVANT_MANAGER
           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       PortableServer::ServantRetentionPolicy_var retention =
         root_poa->create_servant_retention_policy (
           PortableServer::NON_RETAIN
           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       // Create the PolicyList containing the policies necessary for
       // the POA to support ServantLocators.
@@ -919,8 +901,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
       // Create the child POA with the above ServantManager policies.
       // The ServantManager will be the MemberLocator.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        root_poa->the_POAManager ();
 
       // The child POA's name will consist of a string that includes
       // the current time in milliseconds in hexidecimal format (only
@@ -945,26 +926,21 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                                          poa_manager.in (),
                                          policy_list
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
-      request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->destroy ();
 
-      retention->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      retention->destroy ();
 
       // Now set the MemberLocator as the child POA's Servant
       // Manager.
       this->poa_->set_servant_manager (member_locator.in ()
                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
 
       this->object_group_manager_.poa (this->poa_.in ());
       this->generic_factory_.poa (this->poa_.in ());
 
       // Activate the child POA.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      poa_manager->activate ();
 
       this->reactor_ = reactor;
       this->root_poa_ = PortableServer::POA::_duplicate (root_poa);
@@ -972,13 +948,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
 
   if (CORBA::is_nil (this->lm_ref_.in ()))
     {
-      this->lm_ref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->lm_ref_ = this->_this ();
 
       orb->register_initial_reference ("LoadManager",
                                        this->lm_ref_.in ()
                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 
   if (CORBA::is_nil (this->load_alert_handler_.in ()))
@@ -991,13 +965,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       PortableServer::ServantBase_var safe_handler = handler;
 
       this->load_alert_handler_ =
-        handler->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        handler->_this ();
     }
 
   this->built_in_balancing_strategy_info_name_.length (1);
@@ -1044,7 +1016,6 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
               CosLoadBalancing::Strategy_var strategy =
                 this->make_strategy (info
                                      ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
 
               if (!CORBA::is_nil (strategy.in ()))
                 {
@@ -1091,13 +1062,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
             ACE_NEW_THROW_EX (rr_servant,
                               TAO_LB_RoundRobin (this->root_poa_.in ()),
                               CORBA::NO_MEMORY ());
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
             PortableServer::ServantBase_var s = rr_servant;
 
             this->round_robin_ =
-              rr_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+              rr_servant->_this ();
           }
       }
 
@@ -1118,13 +1087,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
             ACE_NEW_THROW_EX (rnd_servant,
                               TAO_LB_Random (this->root_poa_.in ()),
                               CORBA::NO_MEMORY ());
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
             PortableServer::ServantBase_var s = rnd_servant;
 
             this->random_ =
-              rnd_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+              rnd_servant->_this ();
           }
       }
 
@@ -1152,13 +1119,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
                 ACE_NEW_THROW_EX (ll_servant,
                                   TAO_LB_LeastLoaded (this->root_poa_.in ()),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
                 PortableServer::ServantBase_var s = ll_servant;
 
                 this->least_loaded_ =
-                  ll_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+                  ll_servant->_this ();
               }
           }
 
@@ -1171,15 +1136,13 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
           ACE_NEW_THROW_EX (ll_servant,
                             TAO_LB_LeastLoaded (this->root_poa_.in ()),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
           PortableServer::ServantBase_var s = ll_servant;
 
           ll_servant->init (info->props
                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
-          return ll_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return ll_servant->_this ();
         }
     }
   else if (ACE_OS::strcmp (info->name.in (), "LoadMinimum") == 0)
@@ -1199,13 +1162,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
                 ACE_NEW_THROW_EX (lm_servant,
                                   TAO_LB_LoadMinimum (this->root_poa_.in ()),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
                 PortableServer::ServantBase_var s = lm_servant;
 
                 this->load_minimum_ =
-                  lm_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+                  lm_servant->_this ();
               }
           }
 
@@ -1218,15 +1179,13 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
           ACE_NEW_THROW_EX (lm_servant,
                             TAO_LB_LoadMinimum (this->root_poa_.in ()),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
           PortableServer::ServantBase_var s = lm_servant;
 
           lm_servant->init (info->props
                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
-          return lm_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return lm_servant->_this ();
         }
     }
   else if (ACE_OS::strcmp (info->name.in (), "LoadAverage") == 0)
@@ -1246,13 +1205,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
                 ACE_NEW_THROW_EX (la_servant,
                                   TAO_LB_LoadAverage (this->root_poa_.in ()),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
                 PortableServer::ServantBase_var s = la_servant;
 
                 this->load_average_ =
-                  la_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+                  la_servant->_this ();
               }
           }
 
@@ -1265,15 +1222,13 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
           ACE_NEW_THROW_EX (la_servant,
                             TAO_LB_LoadAverage (this->root_poa_.in ()),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
           PortableServer::ServantBase_var s = la_servant;
 
           la_servant->init (info->props
                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
-          return la_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return la_servant->_this ();
         }
     }
   return CosLoadBalancing::Strategy::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index b271606a0fb..c394e740d43 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -52,14 +52,14 @@ TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void)
 }
 
 char *
-TAO_LB_LoadMinimum::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadMinimum");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadMinimum::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -70,7 +70,6 @@ TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -166,13 +165,11 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
   CosLoadBalancing::LoadList_var loads =
     load_manager->get_loads (the_location
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   this->push_loads (the_location,
                     loads.in (),
                     loads[0]
                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
 
   return loads._retn ();
 }
@@ -194,7 +191,6 @@ TAO_LB_LoadMinimum::next_member (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -209,7 +205,6 @@ TAO_LB_LoadMinimum::next_member (
                         locations.in (),
                         location
                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (found_location)
     {
@@ -259,7 +254,6 @@ TAO_LB_LoadMinimum::analyze_loads (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (locations->length () == 0)
     ACE_THROW (CORBA::TRANSIENT ());
@@ -288,14 +282,12 @@ TAO_LB_LoadMinimum::analyze_loads (
           CosLoadBalancing::LoadList_var current_loads =
             load_manager->get_loads (loc
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
                             load
                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           total_load.value = total_load.value + load.value;
           tmp[i] = load;
@@ -318,7 +310,6 @@ TAO_LB_LoadMinimum::analyze_loads (
           //
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   avg_load.value = total_load.value / len;
@@ -400,13 +391,12 @@ TAO_LB_LoadMinimum::analyze_loads (
           //
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     }
 
 }
 
 PortableServer::POA_ptr
-TAO_LB_LoadMinimum::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -440,7 +430,6 @@ TAO_LB_LoadMinimum::get_location (
           CosLoadBalancing::LoadList_var current_loads =
             load_manager->get_loads (loc
                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           found_load = 1;
 
@@ -449,7 +438,6 @@ TAO_LB_LoadMinimum::get_location (
                             current_loads.in (),
                             load
                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 /*
           ACE_DEBUG ((LM_DEBUG,
                       "LOC == %u"
@@ -555,7 +543,6 @@ TAO_LB_LoadMinimum::get_location (
           // next location.
         }
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
 //   ACE_DEBUG ((LM_DEBUG,
@@ -599,7 +586,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         tolerance
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
@@ -613,7 +599,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         dampening
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
@@ -627,7 +612,6 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
           this->extract_float_property (property,
                                         per_balance_load
                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index c979845aa0c..dd1cb712c76 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -88,7 +88,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 31c4e10977e..5cf5ab748b7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -32,7 +32,6 @@ TAO_LB_MemberLocator::preinvoke (
       CORBA::Object_var member =
         this->load_manager_->next_member (oid
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
 //       ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
 //       ACE_DEBUG ((LM_DEBUG,
@@ -56,7 +55,6 @@ TAO_LB_MemberLocator::preinvoke (
                              "LoadManager::next_member()");
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index e7e7eeb4443..82fbebf223c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -41,15 +41,12 @@ TAO_LB_ORBInitializer::post_init (
   CORBA::Object_var obj =
     info->resolve_initial_references ("LoadManager"
                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   CosLoadBalancing::LoadManager_var lm =
     CosLoadBalancing::LoadManager::_narrow (obj.in ()
                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
-  CORBA::String_var orbid = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var orbid = info->orb_id ();
 
   PortableInterceptor::IORInterceptor_ptr tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -64,13 +61,11 @@ TAO_LB_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::IORInterceptor_var ior_interceptor = tmp;
 
   info->add_ior_interceptor (ior_interceptor.in ()
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   // ----------------
 
@@ -82,13 +77,11 @@ TAO_LB_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var sr_interceptor = sri;
 
   info->add_server_request_interceptor (sr_interceptor.in ()
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 8898f4ff5c3..f8fdc8189aa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -68,7 +68,6 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void)
               // Clean up all object groups we created.
               this->lm_->delete_object (this->fcids_[i].in ()
                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
             }
           ACE_CATCHANY
             {
@@ -98,7 +97,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
     this->old_orf_->make_object (repository_id,
                                  id
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableGroup::ObjectGroup_var object_group;
 
@@ -109,7 +107,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
                              index,
                              object_group.out ()
                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (found_group)
     {
@@ -124,7 +121,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
                                        this->location_,
                                        obj.in ()
                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
             }
           ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
             {
@@ -158,7 +154,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
                                 CORBA::Object::_nil ());
             }
           ACE_ENDTRY;
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
           this->registered_members_[index] = 1;
         }
@@ -209,7 +204,6 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
                                       criteria,
                                       fcid.out ()
                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
 
           CORBA::ULong const len = this->fcids_.size ();
           this->fcids_.size (len + 1); // Incremental growth.  Yuck!
@@ -220,7 +214,6 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
           group =
             this->orb_->string_to_object (this->object_groups_[index]
                                           ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
         }
 
       if (this->table_.bind (repository_id, group) != 0)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 5e8cdf226ec..53c9b33e1ae 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -54,13 +54,11 @@ TAO_LB_Pull_Handler::handle_timeout (
           // LoadManager prevents nil load monitor references from
           // being registered.
           CosLoadBalancing::LoadList_var load_list =
-            monitor->loads (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            monitor->loads ();
 
           this->load_manager_->push_loads (location,
                                            load_list.in ()
                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
 //           ACE_DEBUG ((LM_DEBUG,
 //                       "LOCATION = %s\tLOAD = %f\n",
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index 56c39655f2d..eac615d5efb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -28,14 +28,14 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa)
 }
 
 char *
-TAO_LB_Random::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_Random::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Random");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_Random::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -46,7 +46,6 @@ TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (props);
 
   return props;
 }
@@ -91,7 +90,6 @@ TAO_LB_Random::next_member (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return TAO_LB_Random::_tao_next_member (object_group,
                                           load_manager,
@@ -109,7 +107,7 @@ TAO_LB_Random::analyze_loads (
 }
 
 PortableServer::POA_ptr
-TAO_LB_Random::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_Random::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index af5bea2b038..12d0ef5dac7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -50,7 +50,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index ab865f8020e..5acd2861bb1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -25,14 +25,14 @@ TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void)
 }
 
 char *
-TAO_LB_RoundRobin::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_RoundRobin::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("RoundRobin");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_RoundRobin::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // There are no RoundRobin properties.  Return an empty property
@@ -46,7 +46,6 @@ TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (props);
 
   return props;
 }
@@ -91,7 +90,6 @@ TAO_LB_RoundRobin::next_member (
   const PortableGroup::ObjectGroupId id =
     load_manager->get_object_group_id (object_group
                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     monitor,
@@ -106,7 +104,6 @@ TAO_LB_RoundRobin::next_member (
   PortableGroup::Locations_var locations =
     load_manager->locations_of_members (object_group
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   const CORBA::ULong len = locations->length ();
 
@@ -128,7 +125,6 @@ TAO_LB_RoundRobin::next_member (
         load_manager->get_member_ref (object_group,
                                       locations[i]
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       // Increment index to point to next location.
       i++;
@@ -163,7 +159,7 @@ TAO_LB_RoundRobin::analyze_loads (
 }
 
 PortableServer::POA_ptr
-TAO_LB_RoundRobin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_RoundRobin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index a96a1120223..712924ca4c6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -51,7 +51,7 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::Properties * get_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 10bb3303a39..75813c76a50 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -23,14 +23,14 @@ TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void)
 }
 
 char *
-TAO_LB_ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ServerRequestInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor");
 }
 
 void
-TAO_LB_ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ServerRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -44,8 +44,7 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
 {
   if (this->load_alert_.alerted ())
     {
-      CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::String_var op = ri->operation ();
 
       if (ACE_OS::strcmp (op.in (), "_get_loads") == 0        // LoadMonitor
           || ACE_OS::strcmp (op.in (), "disable_alert") == 0  // LoadAlert
@@ -58,7 +57,6 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
           IOP::ServiceContext_var service_context =
             ri->get_request_service_context (CosLoadBalancing::LOAD_MANAGED
                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           /*
           // Use TAO-specific "compiled marshaling" instead of
@@ -109,7 +107,6 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
             ACE_RE_THROW;
         }
       ACE_ENDTRY;
-      ACE_CHECK;
 #else
       // Force the client to try another profile since this location
       // is currently overloaded.
@@ -169,8 +166,7 @@ TAO_LB_ServerRequestInterceptor::send_other (
       // LoadAlert object that its member is overloaded, for example.
 
       const PortableInterceptor::ReplyStatus status =
-        ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->reply_status ();
 
       if (status == PortableInterceptor::LOCATION_FORWARD)
         ACE_DEBUG ((LM_INFO,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index a3a94008a27..3330d8ddee0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -63,10 +63,10 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (