diff options
Diffstat (limited to 'TAO/tao/Object_Ref_Table.h')
| -rw-r--r-- | TAO/tao/Object_Ref_Table.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index ac4d6adcda8..014463862e1 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -28,8 +28,6 @@ #include "ace/Array_Map.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Environment; @@ -70,11 +68,10 @@ public: * Register an object reference with the table, and map the given * ID to it. * @retval 0 Success - * @retval -1 Duplicate id if @c rebind is false + * @retval -1 Duplicate id */ int register_initial_reference (const char * id, - CORBA::Object_ptr obj, - bool rebind = false); + CORBA::Object_ptr obj); /// Return the object reference associated with the given ID. /// A duplicate is returned. @@ -107,9 +104,9 @@ private: private: - // Disallow copying and assignment. - TAO_Object_Ref_Table (const TAO_Object_Ref_Table &); - void operator= (const TAO_Object_Ref_Table &); + /// Prevent copying + ACE_UNIMPLEMENTED_FUNC (TAO_Object_Ref_Table (const TAO_Object_Ref_Table &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Object_Ref_Table &)) private: @@ -121,7 +118,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/Object_Ref_Table.inl" |