1 files changed, 22 insertions, 42 deletions

diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index f11634ae374..d4e2a521bfe 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -35,7 +35,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void)
 
 void Test_Simple_Test_i::test_method (
     ::CORBA::ULong & error_count
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -56,7 +55,6 @@ void
 Hello::test_basic_arg (
     ::CORBA::Long basic,
     ::CORBA::Long_out x
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -69,8 +67,7 @@ Hello::test_basic_arg (
 }
 
 void
-Hello::test_unbounded_string_arg(const char* message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_unbounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -85,8 +82,7 @@ Hello::test_unbounded_string_arg(const char* message
 
 
 void
-Hello::test_bounded_string_arg(const char* message
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_bounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -101,8 +97,7 @@ Hello::test_bounded_string_arg(const char* message
 
 
 void
-Hello::test_fixed_array_arg(const ::Test::Fixed_Array message
-                              ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_fixed_array_arg(const ::Test::Fixed_Array message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
@@ -118,8 +113,7 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message
 
 
 void
-Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -131,8 +125,7 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message
 
 
 void
-Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -144,8 +137,7 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
 
 
 void
-Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t)
                            ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
@@ -161,8 +153,7 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t
 
 
 void
-Hello::test_var_array_arg(const Test::Var_Array messages
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_var_array_arg(const Test::Var_Array messages)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++)
@@ -177,8 +168,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages
 
 
 void
-Hello::test_special_basic_arg(CORBA::Char value
-                                ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_special_basic_arg(CORBA::Char value)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -191,7 +181,6 @@ Hello::test_special_basic_arg(CORBA::Char value
 
 void Hello::test_objref_arg (
     ::Test::Simple_Test_ptr test
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -202,14 +191,13 @@ void Hello::test_objref_arg (
 
   if (CORBA::is_nil (test))
     ERROR_COUNT ("Hello::test_objref_arg")
-  else 
+  else
   {
     // Increment the error_count before calling test_method() and decrement
     // the error_count when the server handling the test_method() call.
     CORBA::ULong error_count = 0;
     error_count ++;
-    test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    test->test_method (error_count);
     if (error_count != 0)
     {
       ERROR_COUNT ("Hello::test_objref_arg")
@@ -219,7 +207,6 @@ void Hello::test_objref_arg (
 
 void Hello::test_object_arg (
     ::CORBA::Object_ptr o
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -228,11 +215,10 @@ void Hello::test_object_arg (
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (o);
-  
+
   CORBA::ULong error_count = 0;
   error_count ++;
-  simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  simple_test->test_method (error_count);
   if (error_count != 0)
   {
     ERROR_COUNT ("Hello::test_object_arg")
@@ -243,7 +229,6 @@ void Hello::test_args_1 (
     ::CORBA::Object_ptr arg1,
     ::CORBA::Char arg2,
     ::Test::Simple_Test_ptr arg3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -252,14 +237,12 @@ void Hello::test_args_1 (
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (arg1);
-  
+
   CORBA::ULong error_count = 0;
   error_count ++;
-  simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  simple_test->test_method (error_count);
   error_count ++;
-  arg3->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  arg3->test_method (error_count);
 
   if (error_count != 0)
   {
@@ -274,7 +257,6 @@ void Hello::test_args_2 (
     const char * arg1,
     const ::Test::Fixed_Array arg2,
     const ::Test::TimeOfDay & arg3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -284,15 +266,15 @@ void Hello::test_args_2 (
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
   if (ACE_OS::strncmp (arg1, TEST_STR, strlen (TEST_STR)) != 0 )
     ERROR_COUNT ("Hello::test_args_2")
-  
+
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
   {
     if (arg2[i] != static_cast<CORBA::Long> (i + 999))
       ERROR_COUNT ("Hello::test_args_2")
   }
 
-  if (arg3.hour != TEST_HOUR 
-      || arg3.minute != TEST_MINUTE 
+  if (arg3.hour != TEST_HOUR
+      || arg3.minute != TEST_MINUTE
       || arg3.second != TEST_SECOND)
     ERROR_COUNT ("Hello::test_args_2")
 }
@@ -302,7 +284,6 @@ void Hello::test_args_3 (
     const ::Test::Bounded_Var_Size_Arg & arg2,
     const ::Test::Unbounded_Var_Size_Arg & arg3,
     const ::Test::Var_Array arg4
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -324,7 +305,7 @@ void Hello::test_args_3 (
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
@@ -362,12 +343,11 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::string_dup ("Hello there!");
 }
 
-char * 
+char *
 Hello::test_unbounded_string (
     const char * s1,
     char *& s2,
     CORBA::String_out s3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -383,14 +363,14 @@ Hello::test_unbounded_string (
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
   // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
   ACE_OS::sleep (1);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::ULong Hello::error_count () const