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

5 files changed, 12 insertions, 32 deletions

diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index 995499aca20..0e3b1fed94d 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -170,7 +170,6 @@ main (int argc, char *argv[])
                                             argv,
                                             0
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       int n = 64;
       int lo = 128;
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index e781734a4b2..267bf2256ec 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -61,18 +61,15 @@ 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;
 
       CORBA::Object_var object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test::Database_var server =
         Test::Database::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -84,8 +81,7 @@ main (int argc, char *argv[])
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
       CORBA::String_var repository_id =
-        server->_repository_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->_repository_id ();
 
       if (ACE_OS::strcmp (repository_id.in (), "IDL:Test/Database:1.0") != 0)
         {
@@ -131,7 +127,6 @@ main (int argc, char *argv[])
                                token,
                                returned_token
                                ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
 
                   if (token != returned_token)
                     {
@@ -145,7 +140,6 @@ main (int argc, char *argv[])
 
           CORBA::ULong crc_remote =
             server->get_crc (idx ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           CORBA::ULong crc_local =
             ACE::crc32 (elements[idx].get_buffer (),
@@ -165,11 +159,9 @@ main (int argc, char *argv[])
 
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 59e56b30f2d..ecec923fba0 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -4,8 +4,8 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (OctetSeq, 
-           server, 
+ACE_RCSID (OctetSeq,
+           server,
            "$Id$")
 
 const char *ior_output_file = "test.ior";
@@ -42,11 +42,9 @@ 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;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -55,11 +53,9 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ main (int argc, char *argv[])
                                 128); // @@ TODO
 
         Test::Database_var server =
-          server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          server_impl._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", ior.in ()));
 
@@ -91,20 +85,16 @@ 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 ();
 
         ACE_DEBUG ((LM_DEBUG, "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/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index d0166961d72..ff91ed3cd51 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -56,7 +56,6 @@ Database_i::get (Test::Index i
   ACE_NEW_THROW_EX (copy,
                     Test::OctetSeq (this->elements_[i]),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   return copy;
 }
 
@@ -73,7 +72,7 @@ Database_i::get_crc (Test::Index i
 }
 
 void
-Database_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Database_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index d5ca10aac21..f3f02bef367 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -47,7 +47,7 @@ public:
                         ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private: