summaryrefslogtreecommitdiff
path: root/TAO/tao/Policy_Manager.h
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-13 08:06:45 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-13 08:06:45 +0000
commit54dcf71d2d94abfb4d680b59349c5d456da237ae (patch)
tree9f16d7a5c69755b4416b91713a70100cceac818d /TAO/tao/Policy_Manager.h
parent9cdc2c640c6e19ce6d59ffe140b2566cf2c67ff5 (diff)
downloadATCD-54dcf71d2d94abfb4d680b59349c5d456da237ae.tar.gz
ChangeLogTag: Thu Jul 13 02:50:26 2000 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/Policy_Manager.h')
-rw-r--r--TAO/tao/Policy_Manager.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 378afc02187..003e27c67db 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -26,11 +26,19 @@
#if (TAO_HAS_CORBA_MESSAGING == 1)
#include "tao/POA_CORBA.h"
+#include "tao/LocalObject.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
// Forward declarations.
class TAO_RelativeRoundtripTimeoutPolicy;
class TAO_Client_Priority_Policy;
@@ -184,7 +192,9 @@ private:
// ****************************************************************
-class TAO_Export TAO_Policy_Manager : public POA_CORBA::PolicyManager
+class TAO_Export TAO_Policy_Manager :
+ public CORBA::PolicyManager,
+ public TAO_Local_RefCounted_Object
{
public:
TAO_Policy_Manager (void);
@@ -314,7 +324,9 @@ private:
// ****************************************************************
-class TAO_Export TAO_Policy_Current : public POA_CORBA::PolicyCurrent
+class TAO_Export TAO_Policy_Current :
+ public CORBA::PolicyCurrent,
+ public TAO_Local_RefCounted_Object
{
public:
TAO_Policy_Current (void);