1 files changed, 17 insertions, 17 deletions

diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index d65dfde3c07..54e95ead3e1 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -20,38 +20,38 @@ Bottom_Impl::~Bottom_Impl (void)
 }
 
 char *
-Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::top);
 }
 
 char *
-Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::left);
 }
 
 char *
-Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::right);
 }
 
 char *
-Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::bottom);
 }
 
 void
-Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 ///////////////////////////////////////////////////////////
@@ -70,64 +70,64 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void)
 }
 
 char *
-Delegated_Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <top_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <left_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <right_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <bottom_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 void
-Delegated_Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating Shut-Down.\n")));
-  this->delegate_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
-  //this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->delegate_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  //this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }