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

4 files changed, 13 insertions, 32 deletions

diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 6a9cb60d163..09c05cda7be 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -68,7 +68,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (void);
   // Validate the connection
 
 private:
@@ -86,18 +86,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;
 
       Simple_Server_var server =
         Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -172,12 +169,10 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          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
     {
@@ -200,7 +195,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client::validate_connection (void)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -210,7 +205,6 @@ Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TRY
         {
           this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
     }
@@ -221,13 +215,11 @@ Client::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i < this->niterations_; ++i)
         {
           this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n",
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index e911f5aa83c..2317b82edfa 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -101,7 +101,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (void);
   // Validate the connection
 
 private:
@@ -126,11 +126,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,
@@ -139,11 +137,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;
@@ -156,12 +152,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(server_impl);
 
       Simple_Server_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 ()));
 
@@ -178,8 +172,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -228,7 +221,6 @@ Worker::svc (void)
     {
       ACE_Time_Value tv (140, 0);
       this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -248,7 +240,7 @@ SelfClient::SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server,
 }
 
 void
-SelfClient::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+SelfClient::validate_connection (void)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -260,7 +252,6 @@ SelfClient::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TRY
         {
           this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
     }
@@ -271,8 +262,7 @@ SelfClient::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i < this->niterations_; ++i)
         {
@@ -319,7 +309,6 @@ SelfClient::svc (void)
 
           // Just make a call
           this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
 
         }
     }
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
index 3b0bc90496b..ab2a816fb2e 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -23,7 +23,7 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We dont shutdown the ORB. We allow the server to go away as it
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h
index 754314ec14b..a792141e72c 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.h
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h
@@ -34,7 +34,7 @@ public:
   CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private: