summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/PortableServer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableServer/PortableServer.cpp')
-rw-r--r--TAO/tao/PortableServer/PortableServer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index a459b31b8bd..e3edaf32b58 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -76,15 +76,15 @@ TAO_POA_Initializer::init (void)
ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
);
+#if !defined (CORBA_E_MICRO)
ACE_Service_Config::process_directive (
ace_svc_desc_ImplicitActivationStrategyExplicit
);
+#endif /* CORBA_E_MICRO */
-#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
ACE_Service_Config::process_directive (
ace_svc_desc_ImplicitActivationStrategyImplicit
);
-#endif /* CORBA_E_MICRO */
// Strategy factories
@@ -92,7 +92,7 @@ TAO_POA_Initializer::init (void)
ace_svc_desc_ThreadStrategyFactoryImpl
);
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0)
ACE_Service_Config::process_directive (
ace_svc_desc_ThreadStrategySingleFactoryImpl
);
@@ -154,7 +154,7 @@ TAO_POA_Initializer::init (void)
ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
);
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO)
ACE_Service_Config::process_directive (
ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
);
@@ -166,7 +166,7 @@ TAO_POA_Initializer::init (void)
ace_svc_desc_ThreadStrategyORBControl
);
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_MICRO)
ACE_Service_Config::process_directive (
ace_svc_desc_ThreadStrategySingle
);