1 files changed, 10 insertions, 10 deletions

diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index f2b0cee21e2..96a7b7c0b88 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -26,13 +26,13 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void)
 void
 Push_Iterator_Handler::register_callback
   (const Web_Server::Metadata_Type &metadata
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_servant_->metadata (metadata);
 
   // This handler is no longer needed, so deactivate it.
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -40,7 +40,7 @@ void
 Push_Iterator_Handler::run (int *request_count,
                             const char *pathname,
                             Web_Server::Iterator_Factory_ptr factory
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -54,37 +54,37 @@ Push_Iterator_Handler::run (int *request_count,
 
   // Activate the Callback.
   this->callback_ =
-    this->callback_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->callback_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate this Reply Handler.
   this->ami_handler_ =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Register the client callback with the server asynchronously.
   factory->sendc_register_callback (this->ami_handler_.in (),
                                     pathname,
                                     this->callback_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Push_Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+Push_Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }