diff options
Diffstat (limited to 'TAO/tao/IORTable/Table_Adapter.h')
| -rw-r--r-- | TAO/tao/IORTable/Table_Adapter.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index f01ebe13e64..3e1a8b2fcd8 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,7 +15,7 @@ #define TAO_TABLE_ADAPTER_H #include /**/ "ace/pre.h" -#include "tao/IORTable/iortable_export.h" +#include "iortable_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #include "tao/Adapter_Factory.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IOR_Table_Impl; class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter @@ -56,15 +54,9 @@ public: virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); - virtual CORBA::Long initialize_collocated_object (TAO_Stub *); + virtual CORBA::Long initialize_collocated_object (TAO_Stub *, + CORBA::Object_ptr); private: - /// Helper method to find an object bound in the table. - /// @return 1 if found, 0 otherwise. - CORBA::Long find_object (TAO::ObjectKey &key, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - /// The ORB Core we belong to TAO_ORB_Core *orb_core_; @@ -85,8 +77,6 @@ public: virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_Table_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_IORTable, TAO_Table_Adapter_Factory) |