diff options
Diffstat (limited to 'TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp')
-rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index 631d95d573d..bf962eaf46c 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" +#include "RequestProcessingStrategyServantLocatorFI.h" +#include "RequestProcessingStrategy.h" +#include "RequestProcessingStrategyServantLocator.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,24 +62,19 @@ namespace TAO delete strategy; } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyServantLocatorFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyServantLocatorFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyServantLocatorFactoryImpl) + ACE_STATIC_SVC_DEFINE ( + RequestProcessingStrategyServantLocatorFactoryImpl, + ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantLocatorFactoryImpl) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ |