summaryrefslogtreecommitdiffstats
path: root/Source/cmPolicies.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2008-03-02 14:03:33 (GMT)
committerKen Martin <ken.martin@kitware.com>2008-03-02 14:03:33 (GMT)
commit345af175864b104344b69a7820463307d3ac33b1 (patch)
tree090b0e44c7345adb1f3eeff28ceeca3a899c501b /Source/cmPolicies.cxx
parente0059c0db7c2c6360cae66c441f659a23d12f2f3 (diff)
downloadCMake-345af175864b104344b69a7820463307d3ac33b1.zip
CMake-345af175864b104344b69a7820463307d3ac33b1.tar.gz
CMake-345af175864b104344b69a7820463307d3ac33b1.tar.bz2
ENH: revert dumb change
Diffstat (limited to 'Source/cmPolicies.cxx')
-rw-r--r--Source/cmPolicies.cxx42
1 files changed, 21 insertions, 21 deletions
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 46b213d..bbd3913 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -118,8 +118,8 @@ cmPolicies::~cmPolicies()
{
// free the policies
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
- = this->PolicyMap.begin();
- for (;i != this->PolicyMap.end(); ++i)
+ = this->Policies.begin();
+ for (;i != this->Policies.end(); ++i)
{
delete i->second;
}
@@ -135,14 +135,14 @@ void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD,
cmPolicies::PolicyStatus status)
{
// a policy must be unique and can only be defined once
- if (this->PolicyMap.find(iD) != this->PolicyMap.end())
+ if (this->Policies.find(iD) != this->Policies.end())
{
cmSystemTools::Error("Attempt to redefine a CMake policy for policy "
"ID ", this->GetPolicyIDString(iD).c_str());
return;
}
- this->PolicyMap[iD] = new cmPolicy(iD, idString,
+ this->Policies[iD] = new cmPolicy(iD, idString,
shortDescription,
longDescription,
majorVersionIntroduced,
@@ -187,8 +187,8 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
// now loop over all the policies and set them as appropriate
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
- = this->PolicyMap.begin();
- for (;i != this->PolicyMap.end(); ++i)
+ = this->Policies.begin();
+ for (;i != this->Policies.end(); ++i)
{
if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer))
{
@@ -214,7 +214,7 @@ bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id,
{
// if they are setting a feature to anything other than OLD or WARN and the
// feature is not known about then that is an error
- if (this->PolicyMap.find(id) == this->PolicyMap.end())
+ if (this->Policies.find(id) == this->Policies.end())
{
if (status == cmPolicies::WARN ||
status == cmPolicies::OLD)
@@ -235,7 +235,7 @@ bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id,
// setting it to WARN or OLD when the feature is REQUIRED_ALWAYS
if ((status == cmPolicies::WARN ||
status == cmPolicies::OLD) &&
- this->PolicyMap[id]->Status == cmPolicies::REQUIRED_ALWAYS)
+ this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS)
{
cmOStringStream error;
error <<
@@ -244,7 +244,7 @@ bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id,
"question is feature " <<
id <<
" which had new behavior introduced in CMake version " <<
- this->PolicyMap[id]->GetVersionString() <<
+ this->Policies[id]->GetVersionString() <<
" please either update your CMakeLists files to conform to " <<
"the new behavior " <<
"or use an older version of CMake that still supports " <<
@@ -263,7 +263,7 @@ bool cmPolicies::IsValidUsedPolicyStatus(cmPolicies::PolicyID id,
{
// if they are setting a feature to anything other than OLD or WARN and the
// feature is not known about then that is an error
- if (this->PolicyMap.find(id) == this->PolicyMap.end())
+ if (this->Policies.find(id) == this->Policies.end())
{
if (status == cmPolicies::WARN ||
status == cmPolicies::OLD)
@@ -284,8 +284,8 @@ bool cmPolicies::IsValidUsedPolicyStatus(cmPolicies::PolicyID id,
// setting it to WARN or OLD when the feature is REQUIRED_ALWAYS
if ((status == cmPolicies::WARN ||
status == cmPolicies::OLD) &&
- (this->PolicyMap[id]->Status == cmPolicies::REQUIRED_ALWAYS ||
- this->PolicyMap[id]->Status == cmPolicies::REQUIRED_IF_USED))
+ (this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS ||
+ this->Policies[id]->Status == cmPolicies::REQUIRED_IF_USED))
{
cmOStringStream error;
error <<
@@ -294,7 +294,7 @@ bool cmPolicies::IsValidUsedPolicyStatus(cmPolicies::PolicyID id,
"question is feature " <<
id <<
" which had new behavior introduced in CMake version " <<
- this->PolicyMap[id]->GetVersionString() <<
+ this->Policies[id]->GetVersionString() <<
" please either update your CMakeLists files to conform to " <<
"the new behavior " <<
"or use an older version of CMake that still supports " <<
@@ -326,8 +326,8 @@ bool cmPolicies::GetPolicyID(const char *id, cmPolicies::PolicyID &pid)
std::string cmPolicies::GetPolicyIDString(cmPolicies::PolicyID pid)
{
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
- this->PolicyMap.find(pid);
- if (pos == this->PolicyMap.end())
+ this->Policies.find(pid);
+ if (pos == this->Policies.end())
{
return "";
}
@@ -339,8 +339,8 @@ std::string cmPolicies::GetPolicyIDString(cmPolicies::PolicyID pid)
std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id)
{
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
- this->PolicyMap.find(id);
- if (pos == this->PolicyMap.end())
+ this->Policies.find(id);
+ if (pos == this->Policies.end())
{
cmSystemTools::Error(
"Request for warning text for undefined policy!");
@@ -367,8 +367,8 @@ std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id)
std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id)
{
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
- this->PolicyMap.find(id);
- if (pos == this->PolicyMap.end())
+ this->Policies.find(id);
+ if (pos == this->Policies.end())
{
cmSystemTools::Error(
"Request for error text for undefined policy!");
@@ -399,8 +399,8 @@ cmPolicies::GetPolicyStatus(cmPolicies::PolicyID id)
{
// if the policy is not know then what?
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
- this->PolicyMap.find(id);
- if (pos == this->PolicyMap.end())
+ this->Policies.find(id);
+ if (pos == this->Policies.end())
{
// TODO is this right?
return cmPolicies::WARN;