diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
| commit | 8448cf1afd4b7667cb1451cf7fac0b864c091681 (patch) | |
| tree | e7cd895a2fa466e22075c21c31fc83ebc30f476d /TAO/tao/Policy_Set.cpp | |
| parent | d7d4b1b0c8cd2333e509eec6cc3cfd0566cbdfd7 (diff) | |
| download | ATCD-8448cf1afd4b7667cb1451cf7fac0b864c091681.tar.gz | |
Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Policy_Set.cpp')
| -rw-r--r-- | TAO/tao/Policy_Set.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 93f1a6beca9..9ef040f04b3 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -3,17 +3,16 @@ #include "tao/Policy_Set.h" #include "tao/SystemException.h" #include "tao/debug.h" +#include "ace/CORBA_macros.h" #if !defined (__ACE_INLINE__) # include "tao/Policy_Set.inl" #endif /* ! __ACE_INLINE__ */ - ACE_RCSID (tao, Policy_Set, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) @@ -83,8 +82,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) } void -TAO_Policy_Set::copy_from (TAO_Policy_Set *source - ) +TAO_Policy_Set::copy_from (TAO_Policy_Set *source) { if (source == 0) { @@ -146,8 +144,7 @@ TAO_Policy_Set::cleanup_i (void) // @@ !!! Add comments regarding Policy lifetimes, etc. void TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies, - CORBA::SetOverrideType set_add - ) + CORBA::SetOverrideType set_add) { // @@ The spec does not say what to do on this case. if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE) @@ -199,8 +196,7 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies, } void -TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy - ) +TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy) { if (! this->compatible_scope (policy->_tao_scope())) { @@ -251,8 +247,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy } CORBA::PolicyList * -TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types - ) +TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types) { CORBA::ULong const slots = types.length (); CORBA::PolicyList *policy_list_ptr = 0; @@ -336,8 +331,7 @@ TAO_Policy_Set::get_cached_const_policy (TAO_Cached_Policy_Type type) const } CORBA::Policy_ptr -TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type - ) +TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type) { if (type != TAO_CACHED_POLICY_UNCACHED && type < TAO_CACHED_POLICY_MAX_CACHED) |