summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp')
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp35
1 files changed, 14 insertions, 21 deletions
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 0fa7771687c..ef3916e288a 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -1,16 +1,14 @@
// $Id$
-#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
+#include "ImplicitActivationStrategyFactoryImpl.h"
#include "ace/Dynamic_Service.h"
-#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
-#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
+#include "ImplicitActivationStrategyImplicit.h"
+#include "ImplicitActivationStrategyExplicit.h"
ACE_RCSID (PortableServer,
ImplicitActivationStrategyFactoryImpl,
"$Id$")
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
namespace TAO
{
namespace Portable_Server
@@ -54,22 +52,17 @@ namespace TAO
{
// Noop because both types are singletons
}
- }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-ACE_FACTORY_NAMESPACE_DEFINE (
- ACE_Local_Service,
- ImplicitActivationStrategyFactoryImpl,
- TAO_VERSIONED_NAMESPACE_NAME::TAO::Portable_Server::ImplicitActivationStrategyFactoryImpl)
+ ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyFactoryImpl)
-
-ACE_STATIC_SVC_DEFINE (
- ImplicitActivationStrategyFactoryImpl,
- ACE_TEXT ("ImplicitActivationStrategyFactory"),
- ACE_SVC_OBJ_T,
- &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl),
- ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
- 0)
+ ACE_STATIC_SVC_DEFINE (
+ ImplicitActivationStrategyFactoryImpl,
+ ACE_TEXT ("ImplicitActivationStrategyFactory"),
+ ACE_SVC_OBJ_T,
+ &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl),
+ ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+ 0
+ )
+ }
+}