1 files changed, 12 insertions, 25 deletions

diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index e5b465d24c6..bb209487d87 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -17,25 +17,24 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name);
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op2(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op4(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
         char *& message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -43,31 +42,27 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_unbounded_string_arg (
         const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_bounded_string_arg (
         const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_fixed_array_arg (
         const ::Fixed_Array message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_var_array_arg (
         const ::Var_Array messages
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -75,15 +70,13 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_bounded_var_size_arg (
         const ::Bounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void test_unbounded_var_size_arg (
         const ::Unbounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -91,7 +84,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_fixed_size_arg (
         const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -99,7 +91,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_fixed_size_arg_two_way (
         const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -107,7 +98,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_special_basic_arg (
         ::CORBA::Boolean value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -115,7 +105,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_objref_arg (
         ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -123,20 +112,18 @@ class Foo_i : public virtual POA_Foo
 
     virtual void callback_object (
         ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void test_callback (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException, FooException
       ));
-  
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));