diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-06 14:29:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-06 14:29:37 +0000 |
| commit | 55bae6df71ad2fcfb2ecf80c3b049a15cca08848 (patch) | |
| tree | 062f1cc9bf978c3650f29f0240959f4cd4ce0bd5 | |
| parent | e5fb29c4979c34594828ef497f5d897f2aa0ac43 (diff) | |
| download | ATCD-55bae6df71ad2fcfb2ecf80c3b049a15cca08848.tar.gz | |
Wed Dec 6 14:28:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
5 files changed, 12 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index a0a365fd003..51dc83dce28 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -21,6 +21,8 @@ ACE_RCSID (PortableServer, Servant_Retention_Strategy, "$Id$") +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -345,3 +347,5 @@ namespace TAO } TAO_END_VERSIONED_NAMESPACE_DECL + +#endif /* TAO_HAS_MINIMUM_POA == 0 && !CORBA_E_COMPACT && !CORBA_E_MICRO */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 1b26e36fe54..a4db553f55c 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -22,6 +22,8 @@ #include "tao/PortableServer/Servant_Location.h" +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Root_POA; @@ -169,5 +171,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* TAO_HAS_MINIMUM_POA == 0 && !CORBA_E_COMPACT && !CORBA_E_MICRO */ + #include /**/ "ace/post.h" #endif /* TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index bc3a3510554..e0e35d5e034 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -10,7 +10,7 @@ ACE_RCSID (PortableServer, ServantRetentionStrategyNonRetainFactoryImpl, "$Id$") -#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 @@ -69,4 +69,4 @@ ACE_FACTORY_NAMESPACE_DEFINE ( ServantRetentionStrategyNonRetainFactoryImpl, TAO::Portable_Server::ServantRetentionStrategyNonRetainFactoryImpl) -#endif /* TAO_HAS_MINIMUM_POA == 0 */ +#endif /* TAO_HAS_MINIMUM_POA == 0 && !CORBA_E_COMPACT && !CORBA_E_MICRO */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h index 688e49cbeec..407d148d4b0 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h @@ -23,7 +23,7 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ServantRetentionStrategyFactory.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/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 3543a783c74..b71d5a08926 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -105,7 +105,7 @@ namespace TAO ACE_ENV_ARG_DECL) { // Decrement the reference count. - CORBA::UShort new_count = --active_object_map_entry->reference_count_; + CORBA::UShort const new_count = --active_object_map_entry->reference_count_; // Inform the custom servant dispatching (CSD) strategy that the // servant is deactivated. This would be called just once when the |