AbstractBase.*

1 files changed, 46 insertions, 46 deletions

diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index ff74200abe5..2a219388c0a 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -8,14 +8,14 @@
 // ---------------------------------------------------------------------------
 
 ACE_INLINE CORBA::ULong
-CORBA_ORB::_incr_refcnt (void)
+CORBA::ORB::_incr_refcnt (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, lock_, 0);
   return ++this->refcount_;
 }
 
 ACE_INLINE CORBA::ULong
-CORBA_ORB::_decr_refcnt (void)
+CORBA::ORB::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
@@ -29,7 +29,7 @@ CORBA_ORB::_decr_refcnt (void)
 }
 
 ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_duplicate (CORBA::ORB_ptr obj)
+CORBA::ORB::_duplicate (CORBA::ORB_ptr obj)
 {
   if (obj)
     obj->_incr_refcnt ();
@@ -39,25 +39,25 @@ CORBA_ORB::_duplicate (CORBA::ORB_ptr obj)
 // Null pointers represent nil objects.
 
 ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_nil (void)
+CORBA::ORB::_nil (void)
 {
   return 0;
 }
 
 ACE_INLINE void
-CORBA_ORB::_use_omg_ior_format (CORBA::Boolean ior)
+CORBA::ORB::_use_omg_ior_format (CORBA::Boolean ior)
 {
   this->use_omg_ior_format_ = ior;
 }
 
 ACE_INLINE CORBA::Boolean
-CORBA_ORB::_use_omg_ior_format (void)
+CORBA::ORB::_use_omg_ior_format (void)
 {
   return this->use_omg_ior_format_;
 }
 
 ACE_INLINE TAO_ORB_Core *
-CORBA_ORB::orb_core (void) const
+CORBA::ORB::orb_core (void) const
 {
   return this->orb_core_;
 }
@@ -69,7 +69,7 @@ CORBA_ORB::orb_core (void) const
 ACE_INLINE CORBA::Boolean
 CORBA::is_nil (CORBA::ORB_ptr obj)
 {
-  return obj == CORBA_ORB::_nil ();
+  return obj == CORBA::ORB::_nil ();
 }
 
 ACE_INLINE void
@@ -80,164 +80,164 @@ CORBA::release (CORBA::ORB_ptr obj)
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ORB_var
+// Inline operations for class CORBA::ORB_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (void) // default constructor
-  : ptr_ (CORBA_ORB::_nil ())
+CORBA::ORB_var::ORB_var (void) // default constructor
+  : ptr_ (CORBA::ORB::_nil ())
 {
 }
 
 ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (CORBA::ORB_ptr p)
+CORBA::ORB_var::ORB_var (CORBA::ORB_ptr p)
   : ptr_ (p)
 {
 }
 
 ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::ptr (void) const
+CORBA::ORB_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_ORB_var::CORBA_ORB_var (const CORBA_ORB_var &p) // copy constructor
-  : ptr_ (CORBA_ORB::_duplicate (p.ptr ()))
+CORBA::ORB_var::ORB_var (const CORBA::ORB_var &p) // copy constructor
+  : ptr_ (CORBA::ORB::_duplicate (p.ptr ()))
 {
 }
 
 ACE_INLINE
-CORBA_ORB_var::~CORBA_ORB_var (void) // destructor
+CORBA::ORB_var::~ORB_var (void) // destructor
 {
   CORBA::release (this->ptr_);
 }
 
-ACE_INLINE CORBA_ORB_var &
-CORBA_ORB_var::operator= (CORBA::ORB_ptr p)
+ACE_INLINE CORBA::ORB_var &
+CORBA::ORB_var::operator= (CORBA::ORB_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_ORB_var &
-CORBA_ORB_var::operator= (const CORBA_ORB_var &p)
+ACE_INLINE CORBA::ORB_var &
+CORBA::ORB_var::operator= (const CORBA::ORB_var &p)
 {
   if (this != &p)
     {
       CORBA::release (this->ptr_);
-      this->ptr_ = CORBA_ORB::_duplicate (p.ptr ());
+      this->ptr_ = CORBA::ORB::_duplicate (p.ptr ());
     }
   return *this;
 }
 
 ACE_INLINE
-CORBA_ORB_var::operator const CORBA::ORB_ptr &() const // cast
+CORBA::ORB_var::operator const CORBA::ORB_ptr &() const // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA_ORB_var::operator CORBA::ORB_ptr &() // cast
+CORBA::ORB_var::operator CORBA::ORB_ptr &() // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::operator-> (void) const
+CORBA::ORB_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::in (void) const
+CORBA::ORB_var::in (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_var::inout (void)
+CORBA::ORB_var::inout (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_var::out (void)
+CORBA::ORB_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ORB::_nil ();
+  this->ptr_ = CORBA::ORB::_nil ();
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_var::_retn (void)
+CORBA::ORB_var::_retn (void)
 {
   // yield ownership of managed obj reference
   CORBA::ORB_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ORB::_nil ();
+  this->ptr_ = CORBA::ORB::_nil ();
   return val;
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ORB_out
+// Inline operations for class CORBA::ORB_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA::ORB_ptr &p)
+CORBA::ORB_out::ORB_out (CORBA::ORB_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = CORBA_ORB::_nil ();
+  this->ptr_ = CORBA::ORB::_nil ();
 }
 
 ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (CORBA_ORB_var &p) // constructor from _var
+CORBA::ORB_out::ORB_out (CORBA::ORB_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ORB::_nil ();
+  this->ptr_ = CORBA::ORB::_nil ();
 }
 
 ACE_INLINE
-CORBA_ORB_out::CORBA_ORB_out (const CORBA_ORB_out &p) // copy constructor
+CORBA::ORB_out::ORB_out (const CORBA::ORB_out &p) // copy constructor
   : ptr_ (p.ptr_)
 {}
 
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (CORBA_ORB_out &p)
+ACE_INLINE CORBA::ORB_out &
+CORBA::ORB_out::operator= (CORBA::ORB_out &p)
 {
   this->ptr_ = p.ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (const CORBA_ORB_var &p)
+ACE_INLINE CORBA::ORB_out &
+CORBA::ORB_out::operator= (const CORBA::ORB_var &p)
 {
-  this->ptr_ = CORBA_ORB::_duplicate (p.ptr ());
+  this->ptr_ = CORBA::ORB::_duplicate (p.ptr ());
   return *this;
 }
 
-ACE_INLINE CORBA_ORB_out &
-CORBA_ORB_out::operator= (CORBA::ORB_ptr p)
+ACE_INLINE CORBA::ORB_out &
+CORBA::ORB_out::operator= (CORBA::ORB_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE
-CORBA_ORB_out::operator CORBA::ORB_ptr &() // cast
+CORBA::ORB_out::operator CORBA::ORB_ptr &() // cast
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::ORB_ptr &
-CORBA_ORB_out::ptr (void) // ptr
+CORBA::ORB_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB_out::operator-> (void)
+CORBA::ORB_out::operator-> (void)
 {
   return this->ptr_;
 }