diff options
Diffstat (limited to 'TAO/tao/Policy_Current_Impl.h')
| -rw-r--r-- | TAO/tao/Policy_Current_Impl.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index f5a2c15fca1..7f0606e9199 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -33,11 +33,6 @@ #include "tao/LocalObject.h" #include "tao/Policy_Set.h" -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Policy_Current_Impl @@ -47,22 +42,17 @@ public: TAO_Policy_Current_Impl (void); /// Obtain a single policy. - CORBA::Policy_ptr get_policy (CORBA::PolicyType policy - ACE_ENV_ARG_DECL); + CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); /// Obtain a single cached policy. - CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type - ACE_ENV_ARG_DECL); + CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); // = The CORBA::PolicyManager operations - CORBA::PolicyList * get_policy_overrides ( - const CORBA::PolicyTypeSeq & ts - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); + CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & ts); void set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ); private: /// The implementation. @@ -71,10 +61,6 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - #if defined (__ACE_INLINE__) # include "tao/Policy_Current_Impl.inl" #endif /* __ACE_INLINE__ */ |