1 files changed, 14 insertions, 16 deletions

diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 6463bd8e9ec..e0b003a58bb 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -16,49 +16,47 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Hello::throw_exception (ACE_ENV_SINGLE_ARG_DECL)
+Hello::throw_exception (void)
   ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException))
 {
-  ACE_THROW (Test::MyException ());
+  throw Test::MyException ();
 }
 
 // Nested sequence step 1 - This op called by the client on the server
 CORBA::Boolean
-Hello::call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
+Hello::call_me_back (Test::Hello_ptr me)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean result = me->call_back (ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean result = me->call_back ();
   return result;
 }
 
 // Nested sequence step 2 - This op called by the server on the client
-CORBA::Boolean 
-Hello::call_back (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Boolean
+Hello::call_back (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean result = server_->check_request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean result = server_->check_request_id ();
   return result;
-}    
+}
 
 // Nested sequence step 3 - This op called by the client on the server
-CORBA::Boolean 
-Hello::check_request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean
+Hello::check_request_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The server request interceptor will have set this public static member
@@ -67,7 +65,7 @@ Hello::check_request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::ULong
-Hello::drop_down_dead (ACE_ENV_SINGLE_ARG_DECL)
+Hello::drop_down_dead (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return server_id_;