diff options
Diffstat (limited to 'TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp')
-rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index a2b3d222282..766fb256043 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" +#include "RequestProcessingStrategyServantActivatorFI.h" +#include "RequestProcessingStrategy.h" +#include "RequestProcessingStrategyServantActivator.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -12,8 +12,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -64,23 +62,18 @@ namespace TAO delete strategy; } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyServantActivatorFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyServantActivatorFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyServantActivatorFactoryImpl) + ACE_STATIC_SVC_DEFINE ( + RequestProcessingStrategyServantActivatorFactoryImpl, + ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantActivatorFactoryImpl) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ |