diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-08-13 23:40:50 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-08-13 23:40:50 +0000 |
| commit | bd5991900fb170449d4038ef06704f6ac4088af0 (patch) | |
| tree | 15b22e89b63dde5a01928d5d2ea9dca235dcf3bc /TAO/tao/PortableServer/POAManager.h | |
| parent | fe2e1c57a4d9506701d1609c8aef5405a439addf (diff) | |
| download | ATCD-bd5991900fb170449d4038ef06704f6ac4088af0.tar.gz | |
Sun Aug 13 23:30:02 UTC 2006 Yan Dai <dai_y@ociweb.com>
Diffstat (limited to 'TAO/tao/PortableServer/POAManager.h')
| -rw-r--r-- | TAO/tao/PortableServer/POAManager.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 64b9d71e8d4..386f008e10c 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -42,6 +42,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward decl. class TAO_Root_POA; class TAO_Object_Adapter; + +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) class TAO_POAManager_Factory; namespace PortableServer @@ -49,6 +51,7 @@ namespace PortableServer class POAManagerFactory; typedef POAManagerFactory *POAManagerFactory_ptr; } +#endif class TAO_PortableServer_Export TAO_POA_Manager : public PortableServer::POAManager, @@ -90,9 +93,13 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); TAO_POA_Manager (TAO_Object_Adapter &object_adapter, +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) const char * id, const ::CORBA::PolicyList & policies, PortableServer::POAManagerFactory_ptr poa_manager_factory); +#else + const char * id); +#endif ~TAO_POA_Manager (void); @@ -106,7 +113,9 @@ public: ACE_ENV_SINGLE_ARG_DECL ); +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::PolicyList& get_policies (); +#endif protected: @@ -160,11 +169,13 @@ protected: CORBA::String_var id_; -#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) + TAO_POAManager_Factory& poa_manager_factory_; + CORBA::PolicyList policies_; + #endif - CORBA::PolicyList policies_; private : |