diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index f121cfc75f3..bad0af39eea 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -15,29 +15,29 @@ BasicLogFactory_i::~BasicLogFactory_i() DsLogAdmin::BasicLogFactory_ptr BasicLogFactory_i::activate (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { DsLogAdmin::BasicLogFactory_var v_return; PortableServer::ObjectId_var oid = poa->activate_object (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); CORBA::Object_var obj = poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); // narrow and store the result.. this->log_mgr_ = DsLogAdmin::LogMgr::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); v_return = DsLogAdmin::BasicLogFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); return v_return._retn (); @@ -47,7 +47,7 @@ DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_rec_size, DsLogAdmin::LogId_out id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::NoResources )) @@ -59,7 +59,7 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, this->create_with_id (this->max_id_, full_action, max_rec_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); // Set the id to return.. @@ -71,7 +71,7 @@ DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DsLogAdmin::NoResources, @@ -101,14 +101,14 @@ BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, auto_ptr<BasicLog_i> basic_log_auto (basic_log_i); // just in case the activation fails. - basic_log_i->init (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); // Register with the poa - basic_log = basic_log_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log = basic_log_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); - basic_log_i->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log_i->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); // Add to the Hash table.. |