diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-07 16:47:37 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-07 16:47:37 +0100 |
commit | 7d210e952de2ccfd2ac758dbacd7b752da8769e9 (patch) | |
tree | 0e970def70c96a3c19d5f0d37cd17d678f70c9a0 /TAO/tao/Policy_Set.cpp | |
parent | 884dcea8b196f72cb995de9f46d61a6ee6521222 (diff) | |
download | ATCD-7d210e952de2ccfd2ac758dbacd7b752da8769e9.tar.gz |
Removed redundant void, use nullptr/override in the TAO core
Diffstat (limited to 'TAO/tao/Policy_Set.cpp')
-rw-r--r-- | TAO/tao/Policy_Set.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index bd3507cfebb..c7e28444dba 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -14,10 +14,10 @@ TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) : scope_ (scope) { for (unsigned int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i) - this->cached_policies_[i] = 0; + this->cached_policies_[i] = nullptr; } -TAO_Policy_Set::~TAO_Policy_Set (void) +TAO_Policy_Set::~TAO_Policy_Set () { try { @@ -35,7 +35,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) // Initialize the cache. for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i) { - this->cached_policies_[i] = 0; + this->cached_policies_[i] = nullptr; } // Copy over the policy list. @@ -78,7 +78,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs) void TAO_Policy_Set::copy_from (TAO_Policy_Set *source) { - if (source == 0) + if (source == nullptr) { return; } @@ -119,7 +119,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source) } void -TAO_Policy_Set::cleanup_i (void) +TAO_Policy_Set::cleanup_i () { CORBA::ULong const len = this->policy_list_.length (); // Cleanup the policy list. @@ -134,7 +134,7 @@ TAO_Policy_Set::cleanup_i (void) // Cleanup the cache. for (CORBA::ULong j = 0; j < TAO_CACHED_POLICY_MAX_CACHED; ++j) { - this->cached_policies_[j] = 0; + this->cached_policies_[j] = nullptr; } } @@ -247,7 +247,7 @@ CORBA::PolicyList * TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types) { CORBA::ULong const slots = types.length (); - CORBA::PolicyList *policy_list_ptr = 0; + CORBA::PolicyList *policy_list_ptr = nullptr; if (slots == 0) { |