1 files changed, 14 insertions, 20 deletions

diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index 0fc3f158fc1..47a13d574c1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -19,54 +19,48 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Basic::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
+Basic::remove_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_);
       this->lm_->remove_member (this->object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                location);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
 
     }
-  ACE_CATCH (PortableGroup::ObjectNotFound, ex)
+  catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying member\n");
+      ex._tao_print_exception ("Exception caught while destroying member\n");
     }
-  ACE_ENDTRY;
 
 }
 
 void
-Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }