diff options
Diffstat (limited to 'TAO/tao/Object_Ref_Table.inl')
| -rw-r--r-- | TAO/tao/Object_Ref_Table.inl | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index e9abc371750..e2cc5ccccab 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE) @@ -14,18 +12,9 @@ TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) ACE_INLINE int TAO_Object_Ref_Table::register_initial_reference ( const char *id, - CORBA::Object_ptr obj, - bool rebind) + CORBA::Object_ptr obj) { - if (rebind) - { - if (this->unbind (id) == -1) - return -1; - else - return this->bind (id, obj); - } - else - return this->bind (id, obj); + return this->bind (id, obj); } ACE_INLINE CORBA::Object_ptr @@ -71,5 +60,3 @@ TAO_Object_Ref_Table::unbind (const char *id) return (this->table_.erase (CORBA::String_var (id)) == 0 ? -1 : 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL |