diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-24 23:38:10 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-24 23:38:10 +0000 |
| commit | 4009b3624b39a54f0a4157df0518a7682b307ba9 (patch) | |
| tree | dde227c4144fede4dd9496fa8a90e40e138979a2 | |
| parent | 13e5a05e4f8b6f943ca8ef34c9ee2021c88ba667 (diff) | |
| download | ATCD-4009b3624b39a54f0a4157df0518a7682b307ba9.tar.gz | |
Mon May 24 16:28:20 1999 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | TAO/tao/ORB_Core.h | 6 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.h | 23 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.i | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 67694dd0142..914833c9e2a 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -358,6 +358,9 @@ protected: TAO_Policy_Manager_Impl default_policies_; // The default policies. + + TAO_Policy_Current policy_current_; + // Policy current. #endif /* TAO_HAS_CORBA_MESSAGING */ TAO_POA_Current *poa_current_; @@ -366,9 +369,6 @@ protected: // Note that this is a pointer in order to reduce the include file // dependencies. // - - TAO_Policy_Current policy_current_; - // Policy current. }; // **************************************************************** diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 7ba07791b88..b76fce40027 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -6,6 +6,7 @@ #include "tao/Policy_Manager.h" #include "tao/Environment.h" +#include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) # include "tao/Policy_Manager.i" diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 8797823e746..b71fcf3253b 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -127,17 +127,18 @@ public: // = The CORBA::PolicyManager operations - virtual CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual void set_policy_overrides ( - const CORBA::PolicyList & policies, - CORBA::SetOverrideType set_add, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + CORBA::PolicyList * get_policy_overrides ( + const CORBA::PolicyTypeSeq & ts, + CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment::default_environment () + ); + + void set_policy_overrides ( + const CORBA::PolicyList & policies, + CORBA::SetOverrideType set_add, + CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment::default_environment () + ); private: TAO_Policy_Manager_Impl manager_impl_; diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index b416cc43090..71950a34151 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -1,7 +1,5 @@ // $Id$ -#include "tao/ORB_Core.h" - ACE_INLINE TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void) : count_ (0) |