diff options
Diffstat (limited to 'TAO/examples/Quoter')
| -rw-r--r-- | TAO/examples/Quoter/Factory_Finder.cpp | 30 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Factory_Finder.h | 4 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Factory_Finder_i.cpp | 8 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Factory_Finder_i.h | 2 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Generic_Factory.cpp | 38 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Generic_Factory.h | 4 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Generic_Factory_i.cpp | 22 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Generic_Factory_i.h | 6 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Quoter_i.cpp | 28 | ||||
| -rw-r--r-- | TAO/examples/Quoter/Quoter_i.h | 12 | ||||
| -rw-r--r-- | TAO/examples/Quoter/client.cpp | 26 | ||||
| -rw-r--r-- | TAO/examples/Quoter/server.cpp | 46 | ||||
| -rw-r--r-- | TAO/examples/Quoter/server.h | 6 |
13 files changed, 116 insertions, 116 deletions
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp index cc164b10346..c7a76c7a97f 100644 --- a/TAO/examples/Quoter/Factory_Finder.cpp +++ b/TAO/examples/Quoter/Factory_Finder.cpp @@ -35,7 +35,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void) factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter"); factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder"); if (this->quoterNamingContext_var_.ptr () != 0) - this->quoterNamingContext_var_->unbind (factory_Finder_Name TAO_ENV_ARG_PARAMETER); + this->quoterNamingContext_var_->unbind (factory_Finder_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -49,7 +49,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void) int Quoter_Factory_Finder_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; @@ -58,7 +58,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While ORB_Manager::init"; if (this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), @@ -67,7 +67,7 @@ Quoter_Factory_Finder_Server::init (int argc, // Activate the POA manager exception_message = "While activating the POA manager"; - int result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -88,7 +88,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "Failure while activating the Quoter Factory Finder Impl"; CORBA::String_var str = this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -102,7 +102,7 @@ Quoter_Factory_Finder_Server::init (int argc, // Get the Naming Service object reference. exception_message = "While resolving the Name Service"; CORBA::Object_var namingObj_var = - orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -113,7 +113,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IDL_Quoter naming context. @@ -123,13 +123,13 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While resolving the Quoter Naming Context"; CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Quoter Naming Context"; quoterNamingContext_var_ = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -143,13 +143,13 @@ Quoter_Factory_Finder_Server::init (int argc, quoter_Factory_Finder_Name_[0].id = CORBA::string_dup ("Quoter_Factory_Finder"); exception_message = "Factory_Factory::_this"; - CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding the Factory Finder"; quoterNamingContext_var_->bind (quoter_Factory_Finder_Name_, ff_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -168,13 +168,13 @@ Quoter_Factory_Finder_Server::init (int argc, } int -Quoter_Factory_Finder_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Factory_Finder_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -223,14 +223,14 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { - int result = quoter_Factory_Finder_Server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; else { - quoter_Factory_Finder_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Factory_Finder_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h index 44844e12947..3d9e89ca85d 100644 --- a/TAO/examples/Quoter/Factory_Finder.h +++ b/TAO/examples/Quoter/Factory_Finder.h @@ -37,10 +37,10 @@ public: ~Quoter_Factory_Finder_Server (void); // Destructor - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb u_int parse_args (void); diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp index 023e2ec6c8d..9720df205c5 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.cpp +++ b/TAO/examples/Quoter/Factory_Finder_i.cpp @@ -38,7 +38,7 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void) CosLifeCycle::Factories * Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory)) { @@ -54,7 +54,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key // Get the Naming Service object reference. exception_message = "While resolving the Name Service"; CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -65,7 +65,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Take the key supplied to search for a Quoter Factory @@ -74,7 +74,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key // Try to get a reference to a Quoter Factory exception_message = "While resolving the Factory Object"; CORBA::Object_var quoterFactoryObject_var = - namingContext_var->resolve (factoryName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (factoryName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if it is a valid Quoter Factory reference diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h index 8d7beeea56c..97695c7c9b2 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.h +++ b/TAO/examples/Quoter/Factory_Finder_i.h @@ -29,7 +29,7 @@ public: ~Quoter_Factory_Finder_i (void); virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory)); // Returns a sequence of Factories if factories matching the diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index f4329dbf36d..acb7858daf1 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -35,7 +35,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void) generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter"); generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory"); if (this->quoterNamingContext_var_.ptr () != 0) - this->quoterNamingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER); + this->quoterNamingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -52,7 +52,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void) int Quoter_Generic_Factory_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; @@ -61,7 +61,7 @@ Quoter_Generic_Factory_Server::init (int argc, int result = 0; // Initialize the ORB Manager exception_message = "While initing the orb_manager"; - result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER); + result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -69,7 +69,7 @@ Quoter_Generic_Factory_Server::init (int argc, // Activate the POA manager exception_message = "While activating the POA manager"; - result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -88,7 +88,7 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While activating the Generic Factory"; CORBA::String_var str = this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -103,7 +103,7 @@ Quoter_Generic_Factory_Server::init (int argc, // Get the Naming Service object reference. exception_message = "While getting the Naming Service Reference"; CORBA::Object_var namingObj_var = - orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -114,7 +114,7 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingContext_var.in ())) @@ -134,13 +134,13 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While resolving the Quoter"; CORBA::Object_var quoterNamingObj_var = namingContext_var->resolve (quoterContextName - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Quoter"; quoterNamingContext_var_ = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -154,13 +154,13 @@ Quoter_Generic_Factory_Server::init (int argc, quoter_Generic_Factory_Name[0].id = CORBA::string_dup ("Quoter_Generic_Factory"); exception_message = "Generic_Factory::_this"; - CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding the Generic Factory"; quoterNamingContext_var_->bind (quoter_Generic_Factory_Name, gf_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -181,20 +181,20 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While resolving the Life Cycle Service"; CORBA::Object_var life_Cycle_Service_Obj_var = namingContext_var->resolve (life_Cycle_Service_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Life Cycle Service"; LifeCycleService::Life_Cycle_Service_var life_Cycle_Service_var = LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Have a proper reference to Life Cycle Service.\n")); exception_message = "While _this on Generic Factory"; - CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While registering the generic factory"; @@ -202,7 +202,7 @@ Quoter_Generic_Factory_Server::init (int argc, "Bryan 503", // location "Generic Factory", // description object_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -224,13 +224,13 @@ Quoter_Generic_Factory_Server::init (int argc, } int -Quoter_Generic_Factory_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Generic_Factory_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -284,11 +284,11 @@ main (int argc, char *argv []) { if (quoter_Generic_Factory_Server.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - quoter_Generic_Factory_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Generic_Factory_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h index 0c1de6c0cd5..1d5950ebb27 100644 --- a/TAO/examples/Quoter/Generic_Factory.h +++ b/TAO/examples/Quoter/Generic_Factory.h @@ -39,10 +39,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. u_int parse_args (void); diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index d22e7ee8e87..bf8002d1ff4 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -34,7 +34,7 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) CORBA::Boolean Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -44,7 +44,7 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & CosNaming::NamingContext_ptr Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNaming::NamingContext_var quoterNamingContext_var; ACE_TRY @@ -55,7 +55,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the Naming Service object reference. CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -65,7 +65,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Narrow the object reference to a Naming Context. CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name quoterContextName (1); // max = 1 @@ -74,12 +74,12 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the IDL_Quoter naming context. CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; quoterNamingContext_var = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -96,7 +96,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -107,7 +107,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, { CosNaming::NamingContext_var quoterNamingContext_var = this->get_naming_context (factory_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ** now a proper reference to the quoter naming context is @@ -119,7 +119,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Try to get a reference to a Quoter Factory CORBA::Object_var quoterFactoryObject_var = - quoterNamingContext_var->resolve (factory_Name TAO_ENV_ARG_PARAMETER); + quoterNamingContext_var->resolve (factory_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We were able to get a reference to Quoter Factory. @@ -131,7 +131,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, Stock::Quoter_Factory_var factory_var = Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory_var.in ())) @@ -147,7 +147,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Now retrieve the Quoter obj ref corresponding to the key. quoter_var = factory_var->create_quoter ("test" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ > 1) diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h index e0477100101..b03ee673647 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.h +++ b/TAO/examples/Quoter/Generic_Factory_i.h @@ -30,14 +30,14 @@ public: ~Quoter_Generic_Factory_i (void); CORBA::Boolean supports (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns true if the Generic Factory is able to forward a request // for creating an object described by the <factory_key>. CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -48,7 +48,7 @@ public: private: CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // a helper to get the proper naming context. int debug_level_; diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index d24ba43056e..1b9d5a93819 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -45,7 +45,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void) // Initialize everything in the factory -int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) +int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_RETURN (this->my_quoters_, Quoter_i *[this->quoter_num_], @@ -62,18 +62,18 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) const char *location_string = "POA::activate"; ACE_TRY { - this->poa_ptr_->activate_object (this->my_quoters_[i] TAO_ENV_ARG_PARAMETER); + this->poa_ptr_->activate_object (this->my_quoters_[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; location_string = "_this"; - Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; location_string = "CORBA::ORB::object_to_string"; // Stringify the object reference and print it out. CORBA::String_var quoter_ior = TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -93,7 +93,7 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) Stock::Quoter_ptr Quoter_Factory_i::create_quoter (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Quoter)) { @@ -102,7 +102,7 @@ Quoter_Factory_i::create_quoter (const char * if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_)); - return my_quoters_[this->next_quoter_]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return my_quoters_[this->next_quoter_]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -131,7 +131,7 @@ Quoter_i::~Quoter_i (void) CORBA::Long Quoter_i::get_quote (char const * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock, Stock::Invalid_Quoter)) @@ -145,7 +145,7 @@ Quoter_i::get_quote (char const * CosLifeCycle::LifeCycleObject_ptr Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &/*the_criteria*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotCopyable, @@ -177,7 +177,7 @@ CosLifeCycle::LifeCycleObject::_nil (); // Find an appropriate factory over there. exception_message = "While trying to find a factory.\n"; CosLifeCycle::Factories *factories_ptr = - there->find_factories (factoryKey TAO_ENV_ARG_PARAMETER); + there->find_factories (factoryKey ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now it is known that there is at least one factory. @@ -192,7 +192,7 @@ CosLifeCycle::LifeCycleObject::_nil (); exception_message = "While narrowing.\n"; CosLifeCycle::GenericFactory_var generic_Factory_var = CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (generic_Factory_var.in ())) @@ -215,11 +215,11 @@ CosLifeCycle::LifeCycleObject::_nil (); CORBA::Object_var quoterObject_var = generic_Factory_var->create_object (genericFactoryName, criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing object"; - quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER); + quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (quoter_var.in ())) @@ -272,7 +272,7 @@ CosLifeCycle::LifeCycleObject::_nil (); void Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, const CosLifeCycle::Criteria & /* the_criteria */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotMovable, @@ -289,7 +289,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, // Removes the object. Once we shut down the ORB we can call it a day. void -Quoter_i::remove (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Quoter_i::remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NotRemovable)) { diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h index 6408ad5f0bc..b7e1e2b7e5f 100644 --- a/TAO/examples/Quoter/Quoter_i.h +++ b/TAO/examples/Quoter/Quoter_i.h @@ -44,7 +44,7 @@ public: // Destructor virtual CORBA::Long get_quote (const char *stock_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock, Stock::Invalid_Quoter)); @@ -54,7 +54,7 @@ public: virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotCopyable, @@ -64,7 +64,7 @@ public: virtual void move (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotMovable, @@ -72,7 +72,7 @@ public: CosLifeCycle::CannotMeetCriteria)); // Move this object using <there> - virtual void remove (TAO_ENV_SINGLE_ARG_DECL) + virtual void remove (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NotRemovable)); // Removes the object. @@ -105,11 +105,11 @@ public: ~Quoter_Factory_i (void); // Destructor. - int init (TAO_ENV_SINGLE_ARG_DECL); + int init (ACE_ENV_SINGLE_ARG_DECL); // Initialize everything in the factory virtual Stock::Quoter_ptr create_quoter (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Quoter)); // Return the quoter by the id <name>. 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) diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index f0c7b9680ca..d2dfcd160bd 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -62,13 +62,13 @@ Quoter_Server::parse_args (void) int Quoter_Server::init (int argc, char* argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; ACE_TRY { exception_message = "While ORB Manager init"; - int result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -91,19 +91,19 @@ Quoter_Server::init (int argc, // Obtain the RootPOA. CORBA::Object_var obj = - this->orb_manager_.orb()->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. exception_message = "While narrowing the root pos"; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. exception_message = "While getting the POA Manager"; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (quoter_Factory_i_ptr_, @@ -112,7 +112,7 @@ Quoter_Server::init (int argc, 0); exception_message = "While initing the quoter factory"; - quoter_Factory_i_ptr_->init (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Factory_i_ptr_->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var quoter_Factory_oid = @@ -121,22 +121,22 @@ Quoter_Server::init (int argc, exception_message = "While activating quoter factory"; root_poa->activate_object_with_id (quoter_Factory_oid.in (), quoter_Factory_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object reference for first_foo_impl object. exception_message = "While quoter_Factor::_this"; - Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the object reference and print it out. exception_message = "While object_to_string"; CORBA::String_var quoter_Factory_ior = - this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () TAO_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While activating the POA Manager"; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -151,7 +151,7 @@ Quoter_Server::init (int argc, } ACE_ENDTRY; - return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -159,7 +159,7 @@ Quoter_Server::init (int argc, // and Quoter_factory object. int -Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { const char *exception_message = "Null Message"; ACE_TRY @@ -167,7 +167,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb(); CORBA::Object_var naming_obj = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -177,7 +177,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) exception_message = "While narrowing naming context"; namingContext_var_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name quoterContextName (1); @@ -186,7 +186,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) exception_message = "While binding a new context"; CosNaming::NamingContext_var quoterNameContext = - namingContext_var_->bind_new_context (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var_->bind_new_context (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Register the quoter_factory name with the IDL_quoter Naming @@ -196,13 +196,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory"); exception_message = "While using factory _this"; - Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding factory"; quoterNameContext->bind (quoterFactoryContextName, quoter_factory_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -217,13 +217,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) } int -Quoter_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -239,12 +239,12 @@ Quoter_Server::~Quoter_Server (void) factory_name[0].id = CORBA::string_dup ("IDL_Quoter"); factory_name[1].id = CORBA::string_dup ("Quoter_Factory"); if (this->namingContext_var_.ptr () != 0) - this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; factory_name.length (1); if (this->namingContext_var_.ptr () != 0) - this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -265,13 +265,13 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - int result = quoter_server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; - quoter_server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h index b3b238981b0..fe681790c66 100644 --- a/TAO/examples/Quoter/server.h +++ b/TAO/examples/Quoter/server.h @@ -52,17 +52,17 @@ public: ~Quoter_Server (void); // Destructor - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: int parse_args (void); // Parses the commandline arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initializes the name server and registers cubit factory with the // name server. |