diff options
Diffstat (limited to 'TAO/tao/PortableServer')
16 files changed, 85 insertions, 56 deletions
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 551d6f45bdf..edea2d2d328 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -6,6 +6,7 @@ ACE_RCSID (PortableServer, ImplicitActivationStrategyImplicit, "$Id$") +#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -36,4 +37,4 @@ ACE_STATIC_SVC_DEFINE ( ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - +#endif diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 92f9feab992..a1fcea6da7e 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -23,6 +23,8 @@ #include "tao/PortableServer/ImplicitActivationStrategy.h" #include "ace/Service_Config.h" +#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT) + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -43,6 +45,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit) ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit) +#endif #include /**/ "ace/post.h" #endif /* TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index 7b55a084199..b24192c3439 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -1,5 +1,4 @@ -#include "tao/PortableServer/RequestProcessingPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, RequestProcessingPolicy, @@ -7,6 +6,9 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#include "tao/PortableServer/RequestProcessingPolicy.h" +#include "tao/PortableServer/PortableServer.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 475a98bade3..208b7770b31 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -1,5 +1,13 @@ // -*- C++ -*- +#include "tao/orbconf.h" + +ACE_RCSID (PortableServer, + Request_Processing, + "$Id$") + +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + #include "tao/ORB_Constants.h" #include "tao/TSS_Resources.h" #include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" @@ -9,12 +17,6 @@ #include "tao/PortableServer/Servant_Base.h" #include "tao/PortableServer/POA_Current_Impl.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 9ad0493cb75..027240a7c2a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -1,10 +1,6 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, RequestProcessingStrategyDefaultServantFI, @@ -12,6 +8,12 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" +#include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index f0289e350b6..ab9874f5e5d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -1,4 +1,12 @@ // $Id$ +#include "tao/orbconf.h" + +ACE_RCSID (PortableServer, + Request_Processing, + "$Id$") + +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + #include "tao/ORB_Constants.h" #include "tao/PortableServer/ServantActivatorC.h" #include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" @@ -8,12 +16,6 @@ #include "tao/PortableServer/POA_Current_Impl.h" #include "tao/PortableServer/Servant_Upcall.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 69ae2437301..7f57f08204f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -1,10 +1,6 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl, @@ -12,6 +8,12 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" +#include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index df7de1de8bb..aebefaa0118 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -1,3 +1,11 @@ +#include "tao/orbconf.h" + +ACE_RCSID (PortableServer, + Request_Processing, + "$Id$") + +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + #include "tao/ORB_Constants.h" #include "tao/PortableServer/ServantLocatorC.h" #include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" @@ -7,12 +15,6 @@ #include "tao/PortableServer/Non_Servant_Upcall.h" #include "tao/PortableServer/Servant_Base.h" -ACE_RCSID (PortableServer, - Request_Processing, - "$Id$") - -#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index fe3d489977d..9e5c094dd4f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -1,10 +1,6 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl, @@ -12,6 +8,12 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" +#include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 60cd7eb033f..580cbb8fdc1 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -1,9 +1,6 @@ // -*- C++ -*- -#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" -#include "tao/PortableServer/ServantManagerC.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/ORB_Constants.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, Request_Processing, @@ -11,6 +8,11 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" +#include "tao/PortableServer/ServantManagerC.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/ORB_Constants.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index b4301aef697..106e91dcd65 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -1,5 +1,5 @@ -#include "tao/PortableServer/ServantRetentionPolicy.h" -#include "tao/PortableServer/PortableServer.h" + +#include "tao/orbconf.h" ACE_RCSID (PortableServer, ServantRetentionPolicy, @@ -7,6 +7,9 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#include "tao/PortableServer/ServantRetentionPolicy.h" +#include "tao/PortableServer/PortableServer.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index 747e4b42ef3..ce53b971ea4 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -1,5 +1,4 @@ -#include "tao/PortableServer/ThreadPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, ThreadPolicy, @@ -7,6 +6,9 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#include "tao/PortableServer/ThreadPolicy.h" +#include "tao/PortableServer/PortableServer.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index 2a903d2876b..65bbfc2e847 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -1,14 +1,16 @@ // $Id$ -#include "tao/PortableServer/ThreadStrategySingle.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, ThreadStrategySingle, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + +#include "tao/PortableServer/ThreadStrategySingle.h" +#include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h index 0836472a09e..08489c7df75 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.h +++ b/TAO/tao/PortableServer/ThreadStrategySingle.h @@ -33,7 +33,7 @@ #include "ace/Null_Mutex.h" -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index b718ea02ef2..e5561d2bed8 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -1,16 +1,18 @@ // $Id$ -#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" -#include "tao/PortableServer/ThreadStrategy.h" -#include "tao/PortableServer/ThreadStrategySingle.h" -#include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" +#include "tao/orbconf.h" ACE_RCSID (PortableServer, ThreadStrategyFactoryImpl, "$Id$") -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + +#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" +#include "tao/PortableServer/ThreadStrategy.h" +#include "tao/PortableServer/ThreadStrategySingle.h" +#include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index e04f0995a42..3dbcce78a99 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -23,7 +23,7 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ThreadStrategyFactory.h" -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) TAO_BEGIN_VERSIONED_NAMESPACE_DECL |