From 387aff200c94073560a961cd2971ab6826347d4d Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 3 May 2015 10:10:38 +0200 Subject: [PATCH] cmPolicies: Trivialize GetPolicyStatus method. It would be possible to implement this with an XMacro and switch statement, but every codepath currently would still return WARN. --- Source/cmPolicies.cxx | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 10f85ac50..75d12d469 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -124,15 +124,12 @@ const char* idToShortDescription(cmPolicies::PolicyID id) class cmPolicy { public: - cmPolicy(cmPolicies::PolicyID iD, - cmPolicies::PolicyStatus status) + cmPolicy(cmPolicies::PolicyID iD) { this->ID = iD; - this->Status = status; } cmPolicies::PolicyID ID; - cmPolicies::PolicyStatus Status; }; cmPolicies::cmPolicies() @@ -460,10 +457,9 @@ void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD, unsigned int, unsigned int, unsigned int, - cmPolicies::PolicyStatus status) + cmPolicies::PolicyStatus) { - this->Policies[iD] = new cmPolicy(iD, - status); + this->Policies[iD] = new cmPolicy(iD); } //---------------------------------------------------------------------------- @@ -664,18 +660,9 @@ std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id) ///! Get the default status for a policy cmPolicies::PolicyStatus -cmPolicies::GetPolicyStatus(cmPolicies::PolicyID id) +cmPolicies::GetPolicyStatus(cmPolicies::PolicyID) { - // if the policy is not know then what? - std::map::iterator pos = - this->Policies.find(id); - if (pos == this->Policies.end()) - { - // TODO is this right? - return cmPolicies::WARN; - } - - return pos->second->Status; + return cmPolicies::WARN; } //----------------------------------------------------------------------------