diff options
Diffstat (limited to 'TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp')
| -rw-r--r-- | TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp index 279d75c5fc3..074fcdf7de2 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Valuetype_Adapter_Impl.h" -#include "AbstractBase.h" -#include "ValueBase.h" -#include "ValueFactory_Map.h" +#include "tao/Valuetype/Valuetype_Adapter_Impl.h" +#include "tao/Valuetype/AbstractBase.h" +#include "tao/Valuetype/ValueBase.h" +#include "tao/Valuetype/ValueFactory_Map.h" #include "tao/ORB_Core.h" @@ -12,11 +12,7 @@ ACE_RCSID (Valuetype, Valuetype_Adapter_Impl, "$Id$") - -TAO_Valuetype_Adapter_Impl::TAO_Valuetype_Adapter_Impl (void) -{ - -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void) { @@ -56,8 +52,7 @@ int TAO_Valuetype_Adapter_Impl::vf_map_rebind (const char *repo_id, CORBA::ValueFactory &factory) { - return TAO_VALUEFACTORY_MAP::instance ()->rebind (repo_id, - factory); + return map_.rebind (repo_id, factory); } int @@ -65,44 +60,16 @@ TAO_Valuetype_Adapter_Impl::vf_map_unbind (const char *repo_id) { CORBA::ValueFactory fac; - return TAO_VALUEFACTORY_MAP::instance ()->unbind (repo_id, - fac); + return map_.unbind (repo_id, fac); } CORBA::ValueFactory TAO_Valuetype_Adapter_Impl::vf_map_find (const char *repo_id) { CORBA::ValueFactory factory = 0; - (void) TAO_VALUEFACTORY_MAP::instance ()->find (repo_id, - factory); - + (void) map_.find (repo_id, factory); return factory; } -// ********************************************************************* - -// Initialization and registration of dynamic service object. - -int -TAO_Valuetype_Adapter_Impl::Initializer (void) -{ - TAO_ORB_Core::valuetype_adapter_name ( - "Concrete_Valuetype_Adapter" - ); - - return - ACE_Service_Config::process_directive ( - ace_svc_desc_TAO_Valuetype_Adapter_Impl - ); -} - -ACE_STATIC_SVC_DEFINE ( - TAO_Valuetype_Adapter_Impl, - ACE_TEXT ("Concrete_Valuetype_Adapter"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_Valuetype_Adapter_Impl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0 - ) +TAO_END_VERSIONED_NAMESPACE_DECL -ACE_FACTORY_DEFINE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl) |