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

8 files changed, 17 insertions, 40 deletions

diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
index 9633a8d5413..77b56d9aae6 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
@@ -27,11 +27,9 @@ Client_ORBInitializer::post_init (
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var orb_id = info->orb_id ();
 
-  CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::StringSeq_var args = info->arguments ();
 
   CORBA::String_var forward_str;
 
@@ -54,14 +52,12 @@ Client_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
 
   info->add_client_request_interceptor (client_interceptor.in ()
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index 822a351436d..fa98f896530 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -37,11 +37,9 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   info->add_server_request_interceptor (interceptor
                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index 9ab80aa7110..93c9c18b938 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -19,14 +19,14 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 4dc535962a1..3d1a75e1528 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -42,10 +42,10 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
index 8da1c03c45b..4bb1941106e 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
@@ -63,25 +63,21 @@ main (int argc, char *argv[])
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Client ORB"
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
         orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       RedirectionTest::test_var server =
         RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -98,8 +94,7 @@ main (int argc, char *argv[])
                       "CLIENT: Issuing request %d.\n",
                       i));
 
-          number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          number = server->number ();
 
           ACE_DEBUG ((LM_INFO,
                       "CLIENT: Request %d handled by object %d.\n",
@@ -107,8 +102,7 @@ main (int argc, char *argv[])
                       number));
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
index 6ea299edcb3..2eb62181a6e 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
@@ -62,16 +62,13 @@ main (int argc, char *argv[])
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "Server ORB" 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,
@@ -80,11 +77,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;
@@ -94,12 +89,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer (test_impl);
 
       RedirectionTest::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;
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       if (output_file == 0)
@@ -111,18 +104,14 @@ 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 ();
 
       // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       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_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
index 631d5a349e1..ab24a5f150b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -18,14 +18,14 @@ test_i::~test_i (void)
 }
 
 CORBA::Short
-test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::number (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
index 643fb36e3c7..6a733639a65 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
@@ -26,11 +26,11 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short number (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private: