diff options
Diffstat (limited to 'TAO/tao/Policy_Validator.cpp')
| -rw-r--r-- | TAO/tao/Policy_Validator.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index b9753bd0fc2..cd51a8a1426 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/Policy_Validator.h" -#include "tao/Environment.h" -#include "tao/debug.h" +#include "Policy_Validator.h" +#include "Environment.h" +#include "debug.h" #include "ace/Log_Msg.h" @@ -10,18 +10,19 @@ ACE_RCSID (tao, Policy_Validator, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core) : orb_core_ (orb_core), next_ (0) { + // No-Op. } TAO_Policy_Validator::~TAO_Policy_Validator (void) { - delete this->next_; + if (this->next_) + { + delete this->next_; + } } TAO_ORB_Core & @@ -86,7 +87,7 @@ TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (this->next_) + if (this->next_ != 0) { this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -100,5 +101,3 @@ TAO_Policy_Validator::legal_policy (CORBA::PolicyType type) || ((this->next_ != 0) && this->next_->legal_policy_impl (type))); } - -TAO_END_VERSIONED_NAMESPACE_DECL |