ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>

1 files changed, 13 insertions, 13 deletions

diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index c5f8aaad712..a685c33fdeb 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -89,7 +89,7 @@ Quoter_Client::run (void)
   ACE_TRY_NEW_ENV
     {
       exception_message = "While using get_quote ()";
-      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER);
+      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 1)
@@ -102,7 +102,7 @@ Quoter_Client::run (void)
       CORBA::Object_var quoterObj_var =
         this->quoter_var_->copy (factory_Finder_var_.in (),
                                  criteria
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (quoterObj_var.in()))
@@ -114,7 +114,7 @@ Quoter_Client::run (void)
       exception_message = "While narrowing the quoter";
       Stock::Quoter_var copied_quoter_var =
         Stock::Quoter::_narrow (quoterObj_var.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (copied_quoter_var.in()))
@@ -126,7 +126,7 @@ Quoter_Client::run (void)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object.\n"));
 
       exception_message = "While using get_quote () on copied object";
-      q = copied_quoter_var->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER);
+      q = copied_quoter_var->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 1)
@@ -163,7 +163,7 @@ Quoter_Client::init_naming_service (void)
     {
       // Resolve the Naming Service
       CORBA::Object_var naming_obj =
-        orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -173,7 +173,7 @@ Quoter_Client::init_naming_service (void)
 
       exception_message = "While narrowing the naming context";
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -190,7 +190,7 @@ Quoter_Client::init_naming_service (void)
       exception_message = "While resolving the factory finder";
       CORBA::Object_var factory_obj =
         naming_context->resolve (quoterFactoryFinderName
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -199,7 +199,7 @@ Quoter_Client::init_naming_service (void)
       exception_message = "While narrowing the factory finder";
       factory_Finder_var_ =
         Stock::Quoter_Factory_Finder::_narrow (factory_obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory_Finder_var_.in ()))
@@ -233,7 +233,7 @@ Quoter_Client::init_naming_service (void)
       // Find an appropriate factory over there.
       exception_message = "While finding factories";
       CosLifeCycle::Factories *factories_ptr =
-          factory_Finder_var_->find_factories (factoryName TAO_ENV_ARG_PARAMETER);
+          factory_Finder_var_->find_factories (factoryName ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (factories_ptr == 0)
@@ -263,7 +263,7 @@ Quoter_Client::init_naming_service (void)
       exception_message = "While narrowing the factory";
       generic_Factory_var_ =
         CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->generic_Factory_var_.in ()))
@@ -308,7 +308,7 @@ Quoter_Client::init (int argc, char **argv)
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -338,10 +338,10 @@ Quoter_Client::init (int argc, char **argv)
       CORBA::Object_var quoterObject_var =
         this->generic_Factory_var_->create_object (genericFactoryName,
                                                    criteria
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER);
+      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)