1 files changed, 4 insertions, 12 deletions

diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 17caadc1bc1..cc660e1e3c7 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -46,7 +46,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 
 // Initialize everything in the factory
 
-int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL)
+int Quoter_Factory_i::init (void)
 {
   ACE_NEW_RETURN (this->my_quoters_,
                   Quoter_i *[this->quoter_num_],
@@ -64,18 +64,15 @@ int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TRY
         {
           this->poa_ptr_->activate_object (this->my_quoters_[i] ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           location_string = "_this";
-          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this();
 
           location_string = "CORBA::ORB::object_to_string";
           // Stringify the object reference and print it out.
           CORBA::String_var quoter_ior =
             TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in ()
                                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -103,7 +100,7 @@ Quoter_Factory_i::create_quoter (const char *
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_));
 
-  return my_quoters_[this->next_quoter_]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return my_quoters_[this->next_quoter_]->_this ();
 }
 
 
@@ -179,7 +176,6 @@ CosLifeCycle::LifeCycleObject::_nil ();
       exception_message = "While trying to find a factory.\n";
       CosLifeCycle::Factories *factories_ptr =
         there->find_factories (factoryKey ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Now it is known that there is at least one factory.
       Stock::Quoter_var quoter_var;
@@ -194,7 +190,6 @@ CosLifeCycle::LifeCycleObject::_nil ();
         CosLifeCycle::GenericFactory_var generic_Factory_var =
           CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr
                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         if (CORBA::is_nil (generic_Factory_var.in ()))
           {
@@ -217,11 +212,9 @@ CosLifeCycle::LifeCycleObject::_nil ();
             generic_Factory_var->create_object (genericFactoryName,
                                                 criteria
                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           exception_message = "While narrowing object";
           quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (CORBA::is_nil (quoter_var.in ()))
             {
@@ -262,7 +255,6 @@ CosLifeCycle::LifeCycleObject::_nil ();
     }
   ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (CosLifeCycle::LifeCycleObject::_nil());
 
   return lifeCycleObject_ptr;
 }
@@ -290,7 +282,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Quoter_i::remove (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NotRemovable))
 {