1 files changed, 44 insertions, 43 deletions

diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index 1b03dda71ef..b2aadaf0791 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -1,4 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
+//
 // $Id$
 
 ACE_INLINE CORBA::Boolean
@@ -15,113 +16,113 @@ CORBA::release (CORBA::Environment_ptr env)
   delete env;
 }
 
-ACE_INLINE CORBA_Exception*
-CORBA_Environment::exception (void) const
+ACE_INLINE CORBA::Exception*
+CORBA::Environment::exception (void) const
 {
   return this->exception_;
 }
 
-ACE_INLINE CORBA_Environment *
-CORBA_Environment::_duplicate (CORBA_Environment *x)
+ACE_INLINE CORBA::Environment *
+CORBA::Environment::_duplicate (CORBA::Environment *x)
 {
   if (x == 0)
     return 0;
-  return new CORBA_Environment (*x);
+  return new CORBA::Environment (*x);
 }
 
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment::_nil (void)
+ACE_INLINE CORBA::Environment_ptr
+CORBA::Environment::_nil (void)
 {
-  return (CORBA_Environment_ptr)0;
+  return (CORBA::Environment_ptr)0;
 }
 
-// Inline operations for class CORBA_Environment_var
+// Inline operations for class CORBA::Environment_var
 
 ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (void)
+CORBA::Environment_var::Environment_var (void)
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (CORBA_Environment_ptr p)
+CORBA::Environment_var::Environment_var (CORBA::Environment_ptr p)
   : ptr_ (p)
 {}
 
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::ptr (void) const
+ACE_INLINE CORBA::Environment_ptr
+CORBA::Environment_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (const CORBA_Environment_var &p)
-  : ptr_ (new CORBA_Environment (*p.ptr ()))
+CORBA::Environment_var::Environment_var (const CORBA::Environment_var &p)
+  : ptr_ (new CORBA::Environment (*p.ptr ()))
 {}
 
 ACE_INLINE
-CORBA_Environment_var::~CORBA_Environment_var (void)
+CORBA::Environment_var::~Environment_var (void)
 {
   delete this->ptr_;
 }
 
 ACE_INLINE
-CORBA_Environment_var::operator const CORBA_Environment_ptr &() const
+CORBA::Environment_var::operator const CORBA::Environment_ptr &() const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_Environment_var::operator CORBA_Environment_ptr &()
+CORBA::Environment_var::operator CORBA::Environment_ptr &()
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::operator-> (void) const
+ACE_INLINE CORBA::Environment_ptr
+CORBA::Environment_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::in (void) const
+ACE_INLINE CORBA::Environment_ptr
+CORBA::Environment_var::in (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_var::inout (void)
+ACE_INLINE CORBA::Environment_ptr &
+CORBA::Environment_var::inout (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_var::out (void)
+ACE_INLINE CORBA::Environment_ptr &
+CORBA::Environment_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::_retn (void)
+ACE_INLINE CORBA::Environment_ptr
+CORBA::Environment_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  CORBA_Environment_ptr val = this->ptr_;
+  CORBA::Environment_ptr val = this->ptr_;
   this->ptr_ = 0;
   return val;
 }
 
-// Inline operations for class CORBA_Environment_out
+// Inline operations for class CORBA::Environment_out
 
 ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (CORBA_Environment_ptr &p)
+CORBA::Environment_out::Environment_out (CORBA::Environment_ptr &p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (CORBA_Environment_var &p)
+CORBA::Environment_out::Environment_out (CORBA::Environment_var &p)
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -129,38 +130,38 @@ CORBA_Environment_out::CORBA_Environment_out (CORBA_Environment_var &p)
 }
 
 ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (const CORBA_Environment_out &p)
+CORBA::Environment_out::Environment_out (const CORBA::Environment_out &p)
   : ptr_ (p.ptr_)
 {}
 
-ACE_INLINE CORBA_Environment_out &
-CORBA_Environment_out::operator= (const CORBA_Environment_out &p)
+ACE_INLINE CORBA::Environment_out &
+CORBA::Environment_out::operator= (const CORBA::Environment_out &p)
 {
   this->ptr_ = p.ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_Environment_out &
-CORBA_Environment_out::operator= (CORBA_Environment_ptr p)
+ACE_INLINE CORBA::Environment_out &
+CORBA::Environment_out::operator= (CORBA::Environment_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE
-CORBA_Environment_out::operator CORBA_Environment_ptr &()
+CORBA::Environment_out::operator CORBA::Environment_ptr &()
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_out::ptr (void)
+ACE_INLINE CORBA::Environment_ptr &
+CORBA::Environment_out::ptr (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_out::operator-> (void)
+ACE_INLINE CORBA::Environment_ptr
+CORBA::Environment_out::operator-> (void)
 {
   return this->ptr_;
 }