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

1 files changed, 20 insertions, 20 deletions

diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 3bc0cb09cd5..0dde8aad846 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -357,7 +357,7 @@ TAO_ORB_Core::has_shutdown (void)
 }
 
 ACE_INLINE void
-TAO_ORB_Core::check_shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->has_shutdown ())
     {
@@ -391,13 +391,13 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->typecode_factory_))
     {
-      this->resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->typecode_factory_);
@@ -422,39 +422,39 @@ TAO_ORB_Core::portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->dynany_factory_))
     {
-      this->resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->dynany_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_manip_factory_))
     {
-      this->resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->ior_manip_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_table_))
     {
-      this->resolve_ior_table_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_ior_table_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->ior_table_);
@@ -505,7 +505,7 @@ TAO_ORB_Core::poa_current (void)
         {
           // @@ This is a hack.  FIXME!
           // This forces the POACurrent to be initialized.
-          CORBA::Object_var root = this->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Object_var root = this->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -549,7 +549,7 @@ TAO_ORB_Core::default_environment (CORBA_Environment *env)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_rt_orb (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->rt_orb_.in ()))
     {
@@ -561,7 +561,7 @@ TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL)
           this->rt_orb_ =
               this->object_ref_table ().resolve_initial_references (
               TAO_OBJID_RTORB
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Object::_nil ());
         }
     }
@@ -570,7 +570,7 @@ TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->rt_current_.in ()))
     {
@@ -582,7 +582,7 @@ TAO_ORB_Core::resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL)
           this->rt_current_ =
               this->object_ref_table ().resolve_initial_references (
               TAO_OBJID_RTCURRENT
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Object::_nil ());
         }
     }
@@ -611,19 +611,19 @@ TAO_ORB_Core::pi_current (TAO_PICurrent *current)
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
 {
   this->client_request_interceptors_.add_interceptor (interceptor
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
 {
   this->server_request_interceptors_.add_interceptor (interceptor
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 // ------
@@ -650,10 +650,10 @@ TAO_ORB_Core::server_request_interceptors (void)
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::IORInterceptor_ptr interceptor
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
 {
   this->ior_interceptors_.add_interceptor (interceptor
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_IORInterceptor_List::TYPE &