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

42 files changed, 152 insertions, 405 deletions

diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index 851de09a37c..0f84c1dfe81 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -62,7 +62,7 @@ Test_impl::get_vb(
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h
index d7ba0a3f399..2c934a6cffb 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.h
+++ b/TAO/tests/OBV/Any/AnyS_impl.h
@@ -36,10 +36,10 @@ public:
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_AnyTest::VB * get_vb (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual OBV_AnyTest::VB * get_vb (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 2b020e6427c..916e9d3038b 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -43,7 +43,6 @@ main (int argc, char *argv[])
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -58,7 +57,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (va_factory->tao_repository_id (),
                                    va_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       va_factory->_remove_ref (); // release ownership
 
 
@@ -70,7 +68,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (vb_factory->tao_repository_id (),
                                    vb_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       vb_factory->_remove_ref (); // release ownership
 
       // Do local test
@@ -135,11 +132,9 @@ main (int argc, char *argv[])
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       OBV_AnyTest::Test_var test =
         OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -154,7 +149,6 @@ main (int argc, char *argv[])
       CORBA::Any_var result = test->get_something (
           0
           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (!(result.inout () >>= dst) || dst->id () != magic)
         {
@@ -168,7 +162,6 @@ main (int argc, char *argv[])
       result = test->get_something (
           1
           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (!(result.inout () >>= dst_vb) || dst_vb->id () != magic)
         {
@@ -199,7 +192,6 @@ main (int argc, char *argv[])
       result = test->get_something (
           1
           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (!(result.inout () >>= CORBA::Any::to_value(target.out())))
         {
@@ -216,11 +208,9 @@ main (int argc, char *argv[])
         }
 #endif /* TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING */
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n"));
     }
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index aadb21d4cd5..d5567d9696f 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -41,15 +41,12 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -71,12 +67,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_AnyTest::Test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -88,21 +82,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop started.\n"));
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished.\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index 3c8697e8415..cc27085a734 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -31,7 +31,6 @@ Client_Task::svc (void)
       this->corb_->register_value_factory (bn_factory->tao_repository_id (),
                                    bn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -43,7 +42,6 @@ Client_Task::svc (void)
       this->corb_->register_value_factory (tc_factory->tao_repository_id (),
                                    tc_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -55,7 +53,6 @@ Client_Task::svc (void)
       this->corb_->register_value_factory (sn_factory->tao_repository_id (),
                                    sn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
@@ -63,10 +60,8 @@ Client_Task::svc (void)
       // Obtain reference to the object.
       CORBA::Object_var tmp =
         this->corb_->string_to_object(this->input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -163,7 +158,6 @@ Client_Task::svc (void)
 
       TreeController_var tc_result =
         test->reflect (tc.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // The following two ifs will fail until bug 1390 is fixed.
       if (is_equal_tree (tc.in (), tc_result.in ()))
@@ -179,8 +173,7 @@ Client_Task::svc (void)
                             1);
         }
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
     }
@@ -201,7 +194,7 @@ Client_Task::is_equal_tree (TreeController * tree1, TreeController * tree2)
 {
   return is_equal_node (tree1->root (), tree2->root ());
 }
-  
+
 
 int
 Client_Task::is_equal_node (BaseNode * node1, BaseNode * node2)
diff --git a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
index be09bb0c6db..4810498ea88 100644
--- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
@@ -56,7 +56,6 @@ main (int argc, char *argv[])
                          satc.get_TCHAR_argv (),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -80,7 +79,6 @@ main (int argc, char *argv[])
                          catc.get_TCHAR_argv (),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Client_Task client_task (input,
                                corb.in (),
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index 79efb6141fb..29fc693923e 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -37,7 +37,6 @@ Server_Task::svc (void)
       this->sorb_->register_value_factory (bn_factory->tao_repository_id (),
                                    bn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -49,7 +48,6 @@ Server_Task::svc (void)
       this->sorb_->register_value_factory (tc_factory->tao_repository_id (),
                                    tc_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -61,18 +59,15 @@ Server_Task::svc (void)
       this->sorb_->register_value_factory (sn_factory->tao_repository_id (),
                                    sn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
 
       CORBA::Object_var poa_object =
         this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -80,8 +75,7 @@ Server_Task::svc (void)
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Test_impl *test_impl;
       ACE_NEW_RETURN (test_impl,
@@ -90,12 +84,10 @@ Server_Task::svc (void)
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = test_impl->_this ();
 
       CORBA::String_var ior =
         this->sorb_->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the this->output_ exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (this->output_, "w");
@@ -107,21 +99,17 @@ Server_Task::svc (void)
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->destroy ();
    }
  ACE_CATCHANY
    {
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
index 03b0440a092..adda7e06dda 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
@@ -40,7 +40,7 @@ Test_impl::reflect (TreeController * tc
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
index 725369e944a..075ad0cb0ca 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
@@ -38,7 +38,7 @@ public:
       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index ee0512b4177..f2fc37618ad 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -47,13 +47,12 @@ Value2_init_impl::create (
 }
 
 CORBA::ValueBase *
-Value2_init_impl::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+Value2_init_impl::create_for_unmarshal (void)
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
                     Value2_impl,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return ret_val;
 }
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index 895d9fb808b..a42c6089ee9 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -57,7 +57,7 @@ public:
 
 public:
 
-  virtual CORBA::ValueBase * create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::ValueBase * create_for_unmarshal (void);
 
 };
 
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index 49bd2e9401b..bfc2842ae64 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -12,7 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 }
 
 OBV_FactoryTest::BaseValue *
-Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_base_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::BaseValue* ret_val = 0;
@@ -24,7 +24,7 @@ Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 OBV_FactoryTest::Value1 *
-Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value1 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value1* ret_val = 0;
@@ -36,7 +36,7 @@ Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 OBV_FactoryTest::Value2 *
-Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value2 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value2* ret_val = 0;
@@ -48,7 +48,7 @@ Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 8a1e97a6a5a..271bcdd2788 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -31,16 +31,16 @@ public:
   Test_impl (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual OBV_FactoryTest::BaseValue * get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::BaseValue * get_base_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_FactoryTest::Value1 * get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::Value1 * get_value1 (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_FactoryTest::Value2 * get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::Value2 * get_value2 (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2b6a232470a..efe47235d4f 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -43,8 +43,7 @@ no_factory (OBV_FactoryTest::Test_ptr test)
       // Calling this without a factory registred should give a marshal
       // exception with minor code 1
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
     }
   ACE_CATCH (CORBA::MARSHAL, ex)
     {
@@ -74,7 +73,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -82,11 +80,9 @@ main (int argc, char *argv[])
       // Obtain reference to the object
       CORBA::Object_var tmp =
         orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       OBV_FactoryTest::Test_var test =
         OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -110,7 +106,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (base_factory->tao_repository_id (),
                                    base_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       base_factory->_remove_ref (); // release ownership
 
       OBV_FactoryTest::Value1_init *value1_factory = 0;
@@ -121,7 +116,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value1_factory->tao_repository_id (),
                                    value1_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value1_factory->_remove_ref ();
 
       OBV_FactoryTest::Value2_init *value2_factory = 0;
@@ -132,22 +126,18 @@ main (int argc, char *argv[])
       orb->register_value_factory (value2_factory->tao_repository_id (),
                                    value2_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value2_factory->_remove_ref ();
 
       // Now perform the test. I don't check return values.
       // I just hope to get MARSHAL.
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
 
       OBV_FactoryTest::Value1_var value1 =
-        test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value1 ();
 
       OBV_FactoryTest::Value2_var value2 =
-        test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value2 ();
 
       // Test factories.
 
@@ -160,11 +150,9 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 5f6788e57d4..66fec931f07 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -41,15 +41,12 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -71,12 +67,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_FactoryTest::Test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -88,19 +82,15 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index 2a3eb140309..ea3bc443b48 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -43,7 +43,7 @@ Test_impl::reflect (TreeController * tc
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h
index 745f255ad87..7e2cc36574b 100644
--- a/TAO/tests/OBV/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Forward/Test_impl.h
@@ -36,7 +36,7 @@ public:
       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index b61d1544147..77d6ba5a4cb 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -86,7 +86,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -103,7 +102,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (bn_factory->tao_repository_id (),
                                    bn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -115,7 +113,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (tc_factory->tao_repository_id (),
                                    tc_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -127,7 +124,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (sn_factory->tao_repository_id (),
                                    sn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
@@ -135,10 +131,8 @@ main (int argc, char *argv[])
       // Obtain reference to the object.
       CORBA::Object_var tmp =
         orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -192,18 +186,15 @@ main (int argc, char *argv[])
 
       TreeController_var result_tc =
         test->reflect (tc.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Dump the resulting tree.
       dump_tree (result_tc.in ());
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
   ACE_CATCHANY
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index bf17c26cc87..2888506ce84 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -45,7 +45,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // All factories are kindly provided by
       // compiler so we just to put everything in a right order.
@@ -59,7 +58,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (bn_factory->tao_repository_id (),
                                    bn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -71,7 +69,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (tc_factory->tao_repository_id (),
                                    tc_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -83,18 +80,15 @@ main (int argc, char *argv[])
       orb->register_value_factory (sn_factory->tao_repository_id (),
                                    sn_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -102,8 +96,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -115,12 +108,10 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = test_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -132,19 +123,15 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp
index c3548daf462..955841cb593 100644
--- a/TAO/tests/OBV/Simple/Client_i.cpp
+++ b/TAO/tests/OBV/Simple/Client_i.cpp
@@ -31,18 +31,15 @@ Checkpoint_Client_i::run (const char *name,
       Event_var t_e (static_cast<Event*> (new Event_impl (value)));
       t_e->do_print ();
       checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       value = 34;
       t_e = new Event_impl (value);
       t_e->do_print ();
       checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+        checkpoint->shutdown ();
 
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -50,7 +47,6 @@ Checkpoint_Client_i::run (const char *name,
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
index f55cee0af44..6b37d9f1af8 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ b/TAO/tests/OBV/Simple/OBV_impl.cpp
@@ -26,7 +26,7 @@ Event_impl::_copy_value (void)
 
 
 void
-Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_impl::do_print (void)
 {
   ACE_DEBUG((LM_DEBUG, "(value %d)  \n",
              (CORBA::ULong) this->value_()));
@@ -37,7 +37,7 @@ Event_factory::~Event_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_factory::create_for_unmarshal (void)
 {
   return new Event_impl;
 }
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
index 1b619553402..7ef69a968b9 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ b/TAO/tests/OBV/Simple/OBV_impl.h
@@ -18,7 +18,7 @@ class Event_impl : public virtual OBV_Event,
   virtual CORBA::ValueBase* _copy_value (void);
 
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
 };
 
 class Event_factory : public CORBA::ValueFactoryBase
@@ -33,7 +33,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
 };
 
 #endif /* OBV_IMPL_H */
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index a429ce1bc3a..6f7bbb07512 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -55,7 +55,7 @@ Checkpoint_i::put_event (Event *event
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Checkpoint_i::shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 979bc54cc79..e20e22eb249 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -83,7 +83,6 @@ Server<Servant>::init (const char *servant_name,
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -108,7 +107,6 @@ Server<Servant>::init (const char *servant_name,
         this->orb_manager_.activate_under_child_poa (servant_name,
                                                      &this->servant_
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
@@ -135,10 +133,10 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (void)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -250,7 +248,6 @@ Client<InterfaceObj, Var>::init (const char *name,
                                     this->argv_,
                                     name
                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -262,7 +259,6 @@ Client<InterfaceObj, Var>::init (const char *name,
         {
           CORBA::Object_var server_object =
             this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
 
           if (CORBA::is_nil (server_object.in ()))
@@ -272,7 +268,6 @@ Client<InterfaceObj, Var>::init (const char *name,
                               -1);
           this->server_ = InterfaceObj::_narrow (server_object.in ()
                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -294,7 +289,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client<InterfaceObj, Var>::obtain_initial_references (void)
 {
 
   return 0;
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index 380dc749dc6..ef7230a7996 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -60,7 +60,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
 protected:
@@ -121,7 +121,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL);
+  int obtain_initial_references (void);
   // Initialize naming service
 
 protected:
diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp
index c5f5140f307..5f6a2bb5a07 100644
--- a/TAO/tests/OBV/Simple/server.cpp
+++ b/TAO/tests/OBV/Simple/server.cpp
@@ -23,8 +23,7 @@ main (int argc, char *argv[])
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index eeccce8dc1d..25d27ca312e 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -17,18 +17,15 @@ vt_graph_impl::vt_graph_impl (int num_nodes ACE_ENV_ARG_DECL)
 {
   nodes_ ().length (0);
   add_node ("ROOT" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   for (int i = 1; i < num_nodes; i++)
     {
       add_node ("CHILD" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
       nodes_ ()[0]->add_edge (nodes_ ()[i] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
 }
 
 // Get the number of nodes in the vt_graph.
-CORBA::Long vt_graph_impl::size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Long vt_graph_impl::size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return nodes_ ().length ();
@@ -47,7 +44,7 @@ vt_graph_impl::add_node (const char * name ACE_ENV_ARG_DECL_NOT_USED)
 
 // Print out information about each node.
 void
-vt_graph_impl::print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+vt_graph_impl::print (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -99,12 +96,9 @@ test_impl::pass_obj_graph_in (
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 3);
   graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 4);
 }
 
 void
@@ -114,12 +108,9 @@ test_impl::pass_vt_graph_in (
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 3);
   vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 4);
 }
 
 void
@@ -131,16 +122,11 @@ test_impl::pass_obj_graph_out (
 {
   vt_graph_impl * the_vt_graph = 0;
   ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
-  graph_param = the_vt_graph->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  graph_param = the_vt_graph->_this ();
 
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 4);
   graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 5);
 }
 
 void
@@ -153,15 +139,11 @@ test_impl::pass_vt_graph_out (
 
   vt_graph_impl * the_vt_graph = 0;
   ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
   vt_graph_param = the_vt_graph;
 
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 4);
   vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 5);
 
 }
 
@@ -173,12 +155,9 @@ test_impl::pass_obj_graph_inout (
     CORBA::SystemException))
 {
 
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 6);
   graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 7);
 }
 
 void
@@ -189,26 +168,22 @@ test_impl::pass_vt_graph_inout (
     CORBA::SystemException))
 {
 
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 6);
   vt_graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 7);
 
 }
 
 void
-test_impl::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
+test_impl::start (void) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-test_impl::finish (ACE_ENV_SINGLE_ARG_DECL) 
+test_impl::finish (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
@@ -261,7 +236,7 @@ node_impl::change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-node_impl::print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+node_impl::print (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   cout << "  Name: " << name_ () << endl;
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 9d0932b1d87..0faf0621804 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -31,7 +31,7 @@ public:
   void change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void print (ACE_ENV_SINGLE_ARG_DECL)
+  void print (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
@@ -62,14 +62,14 @@ class vt_graph_impl :
   vt_graph_impl (int num_nodes
                  ACE_ENV_ARG_DECL);
 
-  virtual CORBA::Long size (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void add_node (const char * name
                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void print (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void print (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
@@ -121,10 +121,10 @@ class test_impl :
 				    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void finish (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void finish (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index 076d397dfa4..328c4ca9e83 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -43,41 +43,35 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       /* Create, register factories */
 
       Supports_Test::Node_init * node_factory = 0;
-  
+
       ACE_NEW_RETURN (node_factory, node_init_impl, 1);
 
       CORBA::ValueFactory returned_factory =
         orb->register_value_factory (node_factory->tao_repository_id (),
                                      node_factory
                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-	
+
       ACE_ASSERT (returned_factory == 0);
 
       node_factory->_remove_ref ();
@@ -91,8 +85,7 @@ main (int argc, char *argv[])
         orb->register_value_factory (vt_graph_factory->tao_repository_id (),
                                      vt_graph_factory
                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-	
+
       ACE_ASSERT (returned_factory == 0);
 
       vt_graph_factory->_remove_ref ();
@@ -101,34 +94,30 @@ main (int argc, char *argv[])
       /* Check return values for register_value_factory */
 
       Supports_Test::Node_init * node_factory2 = 0;
-  
+
       ACE_NEW_RETURN (node_factory2, node_init_impl, 1);
 
       returned_factory =
         orb->register_value_factory (node_factory2->tao_repository_id (),
                                      node_factory2
                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-	
+
       ACE_ASSERT (returned_factory == node_factory);
 
       node_factory2->_remove_ref ();
 
-	
+
       /* Get test object reference */
-	
+
       CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Supports_Test::test_var my_test =
         Supports_Test::test::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (my_test.in ()))
         ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::test obj ref <%s>\n", ior), 1);
 
-      my_test->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_test->start ();
 
       /* Perform test */
 
@@ -144,82 +133,57 @@ main (int argc, char *argv[])
           Supports_Test::vt_graph_var test_vt_graph = the_vt_graph;
 
           Supports_Test::graph_var test_graph =
-            the_vt_graph->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            the_vt_graph->_this ();
           if (CORBA::is_nil (test_graph.in ()))
             ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::graph obj ref\n"), 1);
           the_vt_graph->DefaultValueRefCountBase::_add_ref ();
 
           // At this point, test_vt_graph and test_graph refer to the same object.
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 3);
           my_test->pass_vt_graph_in (test_vt_graph.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 3);
 
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_graph->size () == 3);
           my_test->pass_obj_graph_in (test_graph.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_graph->size () == 4);
 
           test_vt_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           test_graph->add_node ("NEW3" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           // After the 'pass_vt_graph_out' call returns, test_vt_graph will refer to
           // a new object.
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 6);
           my_test->pass_vt_graph_out (test_vt_graph.out () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 5);
 
           // 'test_graph' still refers to the original object, but after the
           // 'pass_obj_graph_out' call returns, it will refer to a new object,
           // residing on the server.
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_graph->size () == 6);
           my_test->pass_obj_graph_out (test_graph.out () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_graph->size () == 5);
 
           // test_vt_graph and test_graph now refer to different objects.
           test_vt_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           test_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 6);
           my_test->pass_vt_graph_inout (test_vt_graph.inout () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 7);
 
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_graph->size () == 6);
           my_test->pass_obj_graph_inout (test_graph.inout () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_graph->size () == 7);
 
         }
 
-      my_test->finish (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_test->finish ();
 
       /* Shut down */
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Client (%P.%t) completed test successfully\n", id));
 
diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp
index f92eee137c5..6f9ae5f9309 100644
--- a/TAO/tests/OBV/Supports/server.cpp
+++ b/TAO/tests/OBV/Supports/server.cpp
@@ -12,18 +12,14 @@ main (int argc, char * argv[])
 	{
 
 		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
 
 		CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
 
 		PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
 
 		if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1);
 
-		PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+    PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
 
 
 		/* Create, register factories */
@@ -33,7 +29,6 @@ main (int argc, char * argv[])
 		ACE_NEW_RETURN (node_factory, node_init_impl, 1);
 
 		CORBA::ValueFactory returned_factory = orb->register_value_factory (node_factory->tao_repository_id (), node_factory ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
 
 		ACE_ASSERT (returned_factory == 0);
 
@@ -44,7 +39,6 @@ main (int argc, char * argv[])
 		ACE_NEW_RETURN (vt_graph_factory, vt_graph_init_impl, 1);
 
 		returned_factory = orb->register_value_factory (vt_graph_factory->tao_repository_id (), vt_graph_factory ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
 
 		ACE_ASSERT (returned_factory == 0);
 
@@ -56,11 +50,9 @@ main (int argc, char * argv[])
 
     //PortableServer::ServantBase_var owner_transfer = a_test_impl;
 
-      Supports_Test::test_ptr a_test = a_test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      Supports_Test::test_ptr a_test = a_test_impl->_this ();
 
       CORBA::String_var ior = orb->object_to_string (a_test ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
 
       FILE * output_file = ACE_OS::fopen (ior_output_file, "w");
 
@@ -70,20 +62,15 @@ main (int argc, char * argv[])
 
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      a_test_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      a_test_impl->_remove_ref ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      orb->run ();
 
       root_poa->destroy (0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Server (%P.%t) completed test successfully\n"));
 	}
diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp
index 25da5405c51..98ded1b3373 100644
--- a/TAO/tests/OBV/TC_Alignment/client.cpp
+++ b/TAO/tests/OBV/TC_Alignment/client.cpp
@@ -3,8 +3,8 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (TC_Alignment, 
-           client, 
+ACE_RCSID (TC_Alignment,
+           client,
            "$Id$")
 
 static const char *ior_input_file = "file://test.ior";
@@ -31,7 +31,6 @@ register_factories (CORBA::ORB_ptr orb
   orb->register_value_factory (factory1->tao_repository_id (),
                                factory1
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   factory1->_remove_ref ();
 
@@ -43,7 +42,6 @@ register_factories (CORBA::ORB_ptr orb
   orb->register_value_factory (factory3->tao_repository_id (),
                                factory3
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   factory3->_remove_ref ();
 
@@ -55,7 +53,6 @@ register_factories (CORBA::ORB_ptr orb
   orb->register_value_factory (factory5->tao_repository_id (),
                                factory5
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   factory5->_remove_ref ();
 
@@ -67,20 +64,18 @@ register_factories (CORBA::ORB_ptr orb
   orb->register_value_factory (factory7->tao_repository_id (),
                                factory7
                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   factory7->_remove_ref ();
   return 0;
 }
 
 int
-run_test (test_ptr objref, 
+run_test (test_ptr objref,
           CORBA::Long offset
           ACE_ENV_ARG_DECL)
 {
   CORBA::Any_var result = objref->get_value (offset
                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Boolean status = 0;
   CORBA::Long member_value = 0;
@@ -159,30 +154,27 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int 
+int
 main (int argc, char* argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                            argv, 
-                                            "" 
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            ""
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         {
           return 1;
         }
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         orb->string_to_object (ior_input_file
                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int status = register_factories (orb.in ()
                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (status != 0)
         {
@@ -197,12 +189,10 @@ main (int argc, char* argv[])
 
       test_var objref = test::_narrow (obj.in ()
                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       for (CORBA::Long i = 1; i < 8; i += 2)
         {
           status = run_test (objref.in (), i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (status == 0)
             {
@@ -218,13 +208,11 @@ main (int argc, char* argv[])
         }
 
       if (do_shutdown)
-        { 
-          objref->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+        {
+          objref->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp
index ba59b23fa58..5277ae3e7b3 100644
--- a/TAO/tests/OBV/TC_Alignment/server.cpp
+++ b/TAO/tests/OBV/TC_Alignment/server.cpp
@@ -19,12 +19,10 @@ main (int argc, char *argv[])
                          argv,
                          ""
                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -36,22 +34,18 @@ main (int argc, char *argv[])
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
               orb->object_to_string (server.in ()
                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Activated as <%s>\n",
@@ -76,14 +70,11 @@ main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index b495f0bd3c1..bf1a943de14 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -72,7 +72,7 @@ test_i::get_value (CORBA::Long offset
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h
index 978cd770426..12be77d3ce4 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.h
+++ b/TAO/tests/OBV/TC_Alignment/test_i.h
@@ -43,7 +43,7 @@ public:
                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index 43601e5c165..894f7ef7be1 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -198,7 +198,7 @@ Test_impl::op5 (const CORBA::Any& val,
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
index 9ae2aa573af..1b7a904d8c2 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
@@ -87,7 +87,7 @@ public:
       ::CORBA::SystemException
     ));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index 4f75c2cd7c8..7c8b962b95c 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -61,7 +61,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -76,7 +75,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (base_factory->tao_repository_id (),
                                    base_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       base_factory->_remove_ref (); // release ownership
 
 
@@ -89,7 +87,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value1_factory->tao_repository_id (),
                                    value1_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value1_factory->_remove_ref ();
 
 
@@ -102,7 +99,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value2_factory->tao_repository_id (),
                                    value2_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value2_factory->_remove_ref ();
 
 
@@ -114,7 +110,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value3_factory->tao_repository_id (),
                                    value3_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value3_factory->_remove_ref ();
 
       OBV_TruncatableTest::TValue4_init *value4_factory = 0;
@@ -125,7 +120,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value4_factory->tao_repository_id (),
                                    value4_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value4_factory->_remove_ref ();
 
       OBV_TruncatableTest::TValue5_init *value5_factory = 0;
@@ -136,7 +130,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value5_factory->tao_repository_id (),
                                    value5_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value5_factory->_remove_ref ();
 
       OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0;
@@ -147,17 +140,14 @@ main (int argc, char *argv[])
       orb->register_value_factory (nested_value_factory->tao_repository_id (),
                                    nested_value_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       nested_value_factory->_remove_ref ();
 
       // Obtain reference to the object
       CORBA::Object_var tmp =
         orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       OBV_TruncatableTest::Test_var test =
         OBV_TruncatableTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
         {
@@ -184,7 +174,6 @@ main (int argc, char *argv[])
         test->op1 ("case1", &v1, ov1.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case1: A<-tB, truncate B to A"));
@@ -211,7 +200,6 @@ main (int argc, char *argv[])
 
         test->op1 ("case2", &v2, ov2.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case2: A<-tB<-tC, truncate C to A"));
@@ -230,7 +218,6 @@ main (int argc, char *argv[])
 
         test->op2 (&v2, "case3", otv1.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case3: A<-tB<-tC, truncate C to B"));
@@ -256,7 +243,6 @@ main (int argc, char *argv[])
 
         test->op2 (&itv1b, "case3b", otv1b.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                 "case3b: A<-tB, truncatable but no truncation"));
@@ -326,7 +312,6 @@ main (int argc, char *argv[])
         pretest = fail;
         test->op1 ("case5", &v5, ov5.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
           "case5: A<-tB<-tC, B & C have nested value type, truncate C to A"));
@@ -345,7 +330,6 @@ main (int argc, char *argv[])
         pretest = fail;
         test->op3 ("case6", &v5, otv4.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
            "case6: A<-tB<-tC, B & C have nested value type, truncate C to B"));
@@ -370,7 +354,6 @@ main (int argc, char *argv[])
         pretest = fail;
         test->op1 ("case7", &iv, ov.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                 "case7: A<-tB, B has no data, truncate B to A"));
@@ -414,7 +397,6 @@ main (int argc, char *argv[])
         OBV_TruncatableTest::BaseValue_var ov
           = test->op4 ("case8", &v1, 5, &v2, &v3, &v4, desc.inout ()
                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                  "case8: multiple IN truncatable valuetype parameters"
@@ -445,7 +427,6 @@ main (int argc, char *argv[])
         test->op2 (&v1, "case9", ov1.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case9: A<-tB, truncate unknown B to A"));
@@ -475,7 +456,6 @@ main (int argc, char *argv[])
         test->op5 (a, "case10", ov1.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case10: A<-tB, known truncatable via Any"));
@@ -505,7 +485,6 @@ main (int argc, char *argv[])
         test->op5 (a, "case11", ov1.out (), desc.inout ()
                    ACE_ENV_ARG_PARAMETER);
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case11: A<-tB, unknown truncatable via Any"));
@@ -520,11 +499,9 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown orb \n"));
 
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       if (fail)
         {
diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp
index c097af17c86..a7fd537d02c 100644
--- a/TAO/tests/OBV/Truncatable/server.cpp
+++ b/TAO/tests/OBV/Truncatable/server.cpp
@@ -42,15 +42,12 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,8 +55,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_TruncatableTest::Test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,8 +83,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       OBV_TruncatableTest::BaseValue_init *base_factory = 0;
       ACE_NEW_RETURN (base_factory,
@@ -100,7 +93,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (base_factory->tao_repository_id (),
                                    base_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       base_factory->_remove_ref (); // release ownership
 
       OBV_TruncatableTest::TValue1_init *value1_factory = 0;
@@ -111,7 +103,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value1_factory->tao_repository_id (),
                                    value1_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value1_factory->_remove_ref ();
 
       OBV_TruncatableTest::TValue4_init *value4_factory = 0;
@@ -122,7 +113,6 @@ main (int argc, char *argv[])
       orb->register_value_factory (value4_factory->tao_repository_id (),
                                    value4_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       value4_factory->_remove_ref ();
 
       OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0;
@@ -133,19 +123,15 @@ main (int argc, char *argv[])
       orb->register_value_factory (nested_value_factory->tao_repository_id (),
                                    nested_value_factory
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       nested_value_factory->_remove_ref ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 2c74111f3f3..f08ffd276c3 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -261,7 +261,7 @@ Test_impl::struct_op4 (const ::Variable_Struct1 & p1,
 }
 
 
-::VBlongarray * 
+::VBlongarray *
 Test_impl::array_op1 (::VBlongarray * p1,
                       ::VBlongarray *& p2,
                       ::VBlongarray_out p3
@@ -521,7 +521,7 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1,
 
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h
index c870e7270ef..d6c9ac780c7 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.h
+++ b/TAO/tests/OBV/ValueBox/Test_impl.h
@@ -146,7 +146,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index bc264fa3110..28ac2315757 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -292,7 +292,6 @@ int test_basic_invocations (Test * test_object)
 
         VBlong_var result =
           test_object->basic_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->_value () == (53*3));
         OBV_VERITY (p3->_value () == (53*5));
@@ -319,7 +318,6 @@ int test_basic_invocations (Test * test_object)
 
         vb_basic::M_VBlong_var mresult =
           test_object->basic_op2(mp1, mp2, mp3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (mp2->_value () == (53*3));
         OBV_VERITY (mp3->_value () == (53*5));
@@ -335,7 +333,6 @@ int test_basic_invocations (Test * test_object)
         long lresult =
           test_object->basic_op3(p1->_boxed_in(), p2->_boxed_inout(),
                                  p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->_value () == (93*3));
         OBV_VERITY (p3->_value () == (93*5));
@@ -491,7 +488,6 @@ int test_boxed_string_invocations (Test * test_object)
         OBV_VERITY (strcmp(p2->_value (), "string2") == 0);
 
         VBstring_var result = test_object->string_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (strcmp(p2->_value (), "2string") == 0);
         OBV_VERITY (strcmp(p3->_value (), "2string") == 0);
@@ -506,7 +502,6 @@ int test_boxed_string_invocations (Test * test_object)
         CORBA::String_var sresult =
           test_object->string_op2(p1->_boxed_in(), p2->_boxed_inout(),
                                   p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (strcmp(p2->_value (), "2second string") == 0);
         OBV_VERITY (strcmp(p3->_value (), "2second string") == 0);
@@ -655,7 +650,6 @@ int test_boxed_sequence_invocations (Test * test_object)
         OBV_VERITY ((*p1)[3] ==  7);
 
         VBseqlong_var result = test_object->seq_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == 100*3);
         OBV_VERITY ((*p2)[1] == 99*3);
@@ -674,7 +668,6 @@ int test_boxed_sequence_invocations (Test * test_object)
 
         test_object->seq_op2(p1->_boxed_in(), p2->_boxed_inout(),
                              p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == 100*3*3);
         OBV_VERITY ((*p2)[1] == 99*3*3);
@@ -848,7 +841,6 @@ int test_boxed_struct_invocations (Test * test_object)
         OBV_VERITY ((p1->abstruct()).s2 ==  21);
 
         VBfixed_struct1_var result = test_object->struct_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->l() == 92*3);
         OBV_VERITY ((p2->abstruct()).s1 == 171*3);
@@ -914,7 +906,6 @@ int test_boxed_struct_invocations (Test * test_object)
         OBV_VERITY (strcmp(p4->str(), "variable1") == 0);
 
         VBvariable_struct1_var result2 = test_object->struct_op3(p4, p5, p6);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->l() == vs2.l*3);
         OBV_VERITY (strcmp(p5->str(), "2variable") == 0);
@@ -933,7 +924,6 @@ int test_boxed_struct_invocations (Test * test_object)
 
         test_object->struct_op4(p4->_boxed_in(), p5->_boxed_inout(),
                                 p6->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->l() == vs2.l*3*3);
         OBV_VERITY (strcmp(p5->str(), "e2variabl") == 0);
@@ -1076,7 +1066,6 @@ int test_boxed_array_invocations (Test * test_object)
         VBlongarray *p3;
 
         VBlongarray_var result = test_object->array_op1 (p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == (3101*3)
                 && (*p2)[1] == (3202*3)
@@ -1100,7 +1089,6 @@ int test_boxed_array_invocations (Test * test_object)
 #if 0
         test_object->array_op2(p1->_boxed_in(), p2->_boxed_inout(),
                                p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == (3101*3*3)
                 && (*p2)[1] == (3202*3*3)
@@ -1330,7 +1318,6 @@ int test_boxed_union_invocations (Test * test_object)
         VBfixed_union1 * p3;
 
         VBfixed_union1_var result = test_object->union_op1 (p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->_d () == 2);
         OBV_VERITY (p2->m2 () == 789*3);
@@ -1391,7 +1378,6 @@ int test_boxed_union_invocations (Test * test_object)
         VBvariable_union1 * p6;
 
         VBvariable_union1_var result2 = test_object->union_op3 (p4, p5, p6);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->_d () == 2);
         OBV_VERITY (strcmp(p5->m2 (), "aabracadabr") == 0);
@@ -1409,7 +1395,6 @@ int test_boxed_union_invocations (Test * test_object)
 
         test_object->union_op4(p4->_boxed_in(), p5->_boxed_inout(),
                                p6->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->_d () == 2);
         OBV_VERITY (strcmp(p5->m2 (), "raabracadab") == 0);
@@ -1513,12 +1498,12 @@ main (int argc, char *argv[])
 
   ACE_TRY_EX (cleanup)
     {
-      test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      test_object->shutdown ();
       ACE_TRY_CHECK_EX (cleanup);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy ();
       ACE_TRY_CHECK_EX (cleanup);
     }
   ACE_CATCHANY
diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 4eaa84c6db0..f650fa42a83 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/server.cpp
@@ -44,15 +44,12 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +57,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = test_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,19 +84,15 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {