diff options
Diffstat (limited to 'TAO/tao/Object.i')
| -rw-r--r-- | TAO/tao/Object.i | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index 5d306195da3..dd1f0351da5 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -3,7 +3,7 @@ // **************************************************************** ACE_INLINE -CORBA::Object::Object (int) +CORBA_Object::CORBA_Object (int) : servant_ (0), is_collocated_ (0), is_local_ (1), @@ -42,6 +42,12 @@ CORBA_Object::_duplicate (CORBA_Object_ptr obj) return obj; } +ACE_INLINE CORBA::Boolean +CORBA::is_nil (CORBA::Object_ptr obj) +{ + return obj == 0; +} + // Null pointers represent nil objects. ACE_INLINE CORBA_Object_ptr @@ -51,12 +57,6 @@ CORBA_Object::_nil (void) } ACE_INLINE CORBA_Object_ptr -CORBA_Object::_narrow (CORBA_Object_ptr obj, CORBA::Environment&ACE_TRY_ENV) -{ - return CORBA::Object::_unchecked_narrow (obj, ACE_TRY_ENV); -} - -ACE_INLINE CORBA_Object_ptr CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment&) { if (CORBA::is_nil (obj)) @@ -69,7 +69,13 @@ CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment&) (ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))); else - return CORBA_Object::_duplicate (obj); + return CORBA::Object::_duplicate (obj); +} + +ACE_INLINE CORBA_Object_ptr +CORBA_Object::_narrow (CORBA_Object_ptr obj, CORBA::Environment&ACE_TRY_ENV) +{ + return CORBA_Object::_unchecked_narrow (obj, ACE_TRY_ENV); } ACE_INLINE TAO_Stub * @@ -82,12 +88,6 @@ CORBA_Object::_stubobj (void) const // ************************************************************ // These are in CORBA namespace -ACE_INLINE CORBA::Boolean -CORBA::is_nil (CORBA::Object_ptr obj) -{ - return obj == 0; -} - ACE_INLINE void CORBA::release (CORBA_Object_ptr obj) { |