summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
diff options
context:
space:
mode:
authorokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
committerokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
commit15f9b16afed320b4e581b8f61fee7d7fbf1aa9a8 (patch)
treefd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
parent5e12d6686388ccadee1714b94ddee0cce6587bfd (diff)
downloadATCD-15f9b16afed320b4e581b8f61fee7d7fbf1aa9a8.tar.gz
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 1fe01ea657a..4f14bdb4697 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -173,14 +173,14 @@ TAO_Persistent_Context_Index::init (size_t context_size)
// CASE 1:there are no Naming Contexts registered. We need to create
// one.
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
this->root_context_ =
TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
TAO_ROOT_NAMING_CONTEXT,
context_size,
this
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
}
@@ -246,16 +246,16 @@ TAO_Persistent_Context_Index::recreate_all (void)
PortableServer::ServantBase_var s = context;
// Register with the POA.
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
PortableServer::ObjectId_var id =
PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_);
this->poa_->activate_object_with_id (id.in (),
context
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
- CosNaming::NamingContext_var result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ CosNaming::NamingContext_var result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
// If this is the root Naming Context, take a note of it.