diff options
Diffstat (limited to 'TAO/tao/LocalObject.i')
| -rw-r--r-- | TAO/tao/LocalObject.i | 133 |
1 files changed, 63 insertions, 70 deletions
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i index 4ed53a54694..8e58908a879 100644 --- a/TAO/tao/LocalObject.i +++ b/TAO/tao/LocalObject.i @@ -2,8 +2,8 @@ // **************************************************************** -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject::_duplicate (CORBA_LocalObject_ptr obj) +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj) { if (obj) obj->_add_ref (); @@ -12,208 +12,201 @@ CORBA_LocalObject::_duplicate (CORBA_LocalObject_ptr obj) // Null pointers represent nil objects. -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject::_nil (void) +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject::_nil (void) { return 0; } -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject::_narrow (CORBA_Object_ptr obj, - CORBA_Environment&) +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject::_narrow (CORBA::Object_ptr obj, + CORBA::Environment&) { if (obj->_is_local () != 0) return - ACE_reinterpret_cast (CORBA_LocalObject_ptr, + ACE_reinterpret_cast (CORBA::LocalObject_ptr, obj->_tao_QueryInterface (ACE_reinterpret_cast (ptr_arith_t, - &CORBA_LocalObject::_narrow))); + &CORBA::LocalObject::_narrow))); return 0; } -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject::_unchecked_narrow (CORBA_Object_ptr obj, - CORBA_Environment&) +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject::_unchecked_narrow (CORBA::Object_ptr obj, + CORBA::Environment&) { if (obj->_is_local () != 0) return - ACE_reinterpret_cast (CORBA_LocalObject_ptr, + ACE_reinterpret_cast (CORBA::LocalObject_ptr, obj->_tao_QueryInterface (ACE_reinterpret_cast (ptr_arith_t, - &CORBA_LocalObject::_narrow))); + &CORBA::LocalObject::_narrow))); return 0; } ACE_INLINE -CORBA_LocalObject::CORBA_LocalObject (void) - : CORBA_Object (0) -{ -} - -ACE_INLINE -TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void) - // : CORBA_LocalObject () +CORBA::LocalObject::LocalObject () + : ACE_NESTED_CLASS (CORBA, Object (0)) { } // ************************************************************* -// Inline operations for class CORBA_LocalObject_var +// Inline operations for class CORBA::LocalObject_var // ************************************************************* ACE_INLINE -CORBA_LocalObject_var::CORBA_LocalObject_var (void) - : ptr_ (CORBA_LocalObject::_nil ()) +CORBA::LocalObject_var::LocalObject_var (void) + : ptr_ (CORBA::LocalObject::_nil ()) { } ACE_INLINE -CORBA_LocalObject_var::CORBA_LocalObject_var (CORBA_LocalObject_ptr p) +CORBA::LocalObject_var::LocalObject_var (CORBA::LocalObject_ptr p) : ptr_ (p) {} ACE_INLINE -CORBA_LocalObject_var::~CORBA_LocalObject_var (void) +CORBA::LocalObject_var::~LocalObject_var (void) { CORBA::release (this->ptr_); } -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject_var::ptr (void) const +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject_var::ptr (void) const { return this->ptr_; } ACE_INLINE -CORBA_LocalObject_var::CORBA_LocalObject_var (const CORBA_LocalObject_var &p) - // copy constructor - : ptr_ (CORBA_LocalObject::_duplicate (p.ptr ())) +CORBA::LocalObject_var::LocalObject_var (const CORBA::LocalObject_var &p) // copy constructor + : ptr_ (CORBA::LocalObject::_duplicate (p.ptr ())) {} -ACE_INLINE CORBA_LocalObject_var & -CORBA_LocalObject_var::operator= (CORBA_LocalObject_ptr p) +ACE_INLINE CORBA::LocalObject_var & +CORBA::LocalObject_var::operator= (CORBA::LocalObject_ptr p) { CORBA::release (this->ptr_); this->ptr_ = p; return *this; } -ACE_INLINE CORBA_LocalObject_var & -CORBA_LocalObject_var::operator= (const CORBA_LocalObject_var &p) +ACE_INLINE CORBA::LocalObject_var & +CORBA::LocalObject_var::operator= (const CORBA::LocalObject_var &p) { if (this != &p) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_LocalObject::_duplicate (p.ptr ()); + this->ptr_ = CORBA::LocalObject::_duplicate (p.ptr ()); } return *this; } ACE_INLINE -CORBA_LocalObject_var::operator const CORBA_LocalObject_ptr &() const // cast +CORBA::LocalObject_var::operator const CORBA::LocalObject_ptr &() const // cast { return this->ptr_; } ACE_INLINE -CORBA_LocalObject_var::operator CORBA_LocalObject_ptr &() // cast +CORBA::LocalObject_var::operator CORBA::LocalObject_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject_var::operator-> (void) const +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject_var::operator-> (void) const { return this->ptr_; } -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject_var::in (void) const +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject_var::in (void) const { return this->ptr_; } -ACE_INLINE CORBA_LocalObject_ptr & -CORBA_LocalObject_var::inout (void) +ACE_INLINE CORBA::LocalObject_ptr & +CORBA::LocalObject_var::inout (void) { return this->ptr_; } -ACE_INLINE CORBA_LocalObject_ptr & -CORBA_LocalObject_var::out (void) +ACE_INLINE CORBA::LocalObject_ptr & +CORBA::LocalObject_var::out (void) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_LocalObject::_nil (); + this->ptr_ = CORBA::LocalObject::_nil (); return this->ptr_; } -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject_var::_retn (void) +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject_var::_retn (void) { // yield ownership of managed obj reference - CORBA_LocalObject_ptr val = this->ptr_; - this->ptr_ = CORBA_LocalObject::_nil (); + CORBA::LocalObject_ptr val = this->ptr_; + this->ptr_ = CORBA::LocalObject::_nil (); return val; } // ************************************************************* -// Inline operations for class CORBA_LocalObject_out +// Inline operations for class CORBA::LocalObject_out // ************************************************************* ACE_INLINE -CORBA_LocalObject_out::CORBA_LocalObject_out (CORBA_LocalObject_ptr &p) +CORBA::LocalObject_out::LocalObject_out (CORBA::LocalObject_ptr &p) : ptr_ (p) { - this->ptr_ = CORBA_LocalObject::_nil (); + this->ptr_ = CORBA::LocalObject::_nil (); } ACE_INLINE -CORBA_LocalObject_out::CORBA_LocalObject_out (CORBA_LocalObject_var &p) // constructor from _var +CORBA::LocalObject_out::LocalObject_out (CORBA::LocalObject_var &p) // constructor from _var : ptr_ (p.out ()) { CORBA::release (this->ptr_); - this->ptr_ = CORBA_LocalObject::_nil (); + this->ptr_ = CORBA::LocalObject::_nil (); } ACE_INLINE -CORBA_LocalObject_out::CORBA_LocalObject_out (const CORBA_LocalObject_out &p) // copy constructor +CORBA::LocalObject_out::LocalObject_out (const CORBA::LocalObject_out &p) // copy constructor : ptr_ (p.ptr_) {} -ACE_INLINE CORBA_LocalObject_out & -CORBA_LocalObject_out::operator= (const CORBA_LocalObject_out &p) +ACE_INLINE CORBA::LocalObject_out & +CORBA::LocalObject_out::operator= (const CORBA::LocalObject_out &p) { this->ptr_ = p.ptr_; return *this; } -ACE_INLINE CORBA_LocalObject_out & -CORBA_LocalObject_out::operator= (const CORBA_LocalObject_var &p) +ACE_INLINE CORBA::LocalObject_out & +CORBA::LocalObject_out::operator= (const CORBA::LocalObject_var &p) { - this->ptr_ = CORBA_LocalObject::_duplicate (p.ptr ()); + this->ptr_ = CORBA::LocalObject::_duplicate (p.ptr ()); return *this; } -ACE_INLINE CORBA_LocalObject_out & -CORBA_LocalObject_out::operator= (CORBA_LocalObject_ptr p) +ACE_INLINE CORBA::LocalObject_out & +CORBA::LocalObject_out::operator= (CORBA::LocalObject_ptr p) { this->ptr_ = p; return *this; } ACE_INLINE -CORBA_LocalObject_out::operator CORBA_LocalObject_ptr &() // cast +CORBA::LocalObject_out::operator CORBA::LocalObject_ptr &() // cast { return this->ptr_; } -ACE_INLINE CORBA_LocalObject_ptr & -CORBA_LocalObject_out::ptr (void) // ptr +ACE_INLINE CORBA::LocalObject_ptr & +CORBA::LocalObject_out::ptr (void) // ptr { return this->ptr_; } -ACE_INLINE CORBA_LocalObject_ptr -CORBA_LocalObject_out::operator-> (void) +ACE_INLINE CORBA::LocalObject_ptr +CORBA::LocalObject_out::operator-> (void) { return this->ptr_; } |