diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-13 08:06:45 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-13 08:06:45 +0000 |
| commit | 54dcf71d2d94abfb4d680b59349c5d456da237ae (patch) | |
| tree | 9f16d7a5c69755b4416b91713a70100cceac818d /TAO/tao/POAManager.h | |
| parent | 9cdc2c640c6e19ce6d59ffe140b2566cf2c67ff5 (diff) | |
| download | ATCD-54dcf71d2d94abfb4d680b59349c5d456da237ae.tar.gz | |
ChangeLogTag: Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/POAManager.h')
| -rw-r--r-- | TAO/tao/POAManager.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h index 968609a7dcf..c853e2bf560 100644 --- a/TAO/tao/POAManager.h +++ b/TAO/tao/POAManager.h @@ -21,21 +21,33 @@ #define TAO_POAMANAGER_H #include "ace/pre.h" -#include "tao/POAS.h" +#include "tao/PortableServerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// for POA skeleton. - #include "tao/poa_macros.h" +// Local Object +#include "tao/LocalObject.h" + class TAO_POA; class TAO_Object_Adapter; // Forward decl. -class TAO_Export TAO_POA_Manager : public POA_PortableServer::POAManager +// This is to remove "inherits via dominance" warnings from MSVC. +// MSVC is being a little too paranoid. +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +class TAO_Export TAO_POA_Manager : + public PortableServer::POAManager, + public TAO_Local_RefCounted_Object { friend class TAO_POA; friend class TAO_Object_Adapter; |