kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: fix compile errors on vs6 and a warning

This commit is contained in:
Ken Martin 2008-03-02 08:36:18 -05:00
parent c1f692ec27
commit e0059c0db7
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmAddCustomTargetCommand.cxx
View File

@ -46,7 +46,6 @@ bool cmAddCustomTargetCommand
"this is not allowed according to policy CMP_0001. Run " "this is not allowed according to policy CMP_0001. Run "
"cmake --help-policy CMP_0001 for more information."); "cmake --help-policy CMP_0001 for more information.");
return false; return false;
break;
case cmPolicies::REQUIRED_IF_USED: case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS: case cmPolicies::REQUIRED_ALWAYS:
this->SetError( this->SetError(

42
Source/cmPolicies.cxx
View File

@ -118,8 +118,8 @@ cmPolicies::~cmPolicies()
{ {
// free the policies // free the policies
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin(); = this->PolicyMap.begin();
for (;i != this->Policies.end(); ++i) for (;i != this->PolicyMap.end(); ++i)
{ {
delete i->second; delete i->second;
} }
@ -135,14 +135,14 @@ void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD,
cmPolicies::PolicyStatus status) cmPolicies::PolicyStatus status)
{ {
// a policy must be unique and can only be defined once // a policy must be unique and can only be defined once
if (this->Policies.find(iD) != this->Policies.end()) if (this->PolicyMap.find(iD) != this->PolicyMap.end())
{ {
cmSystemTools::Error("Attempt to redefine a CMake policy for policy " cmSystemTools::Error("Attempt to redefine a CMake policy for policy "
"ID ", this->GetPolicyIDString(iD).c_str()); "ID ", this->GetPolicyIDString(iD).c_str());
return; return;
} }
this->Policies[iD] = new cmPolicy(iD, idString, this->PolicyMap[iD] = new cmPolicy(iD, idString,
shortDescription, shortDescription,
longDescription, longDescription,
majorVersionIntroduced, majorVersionIntroduced,
@ -187,8 +187,8 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
// now loop over all the policies and set them as appropriate // now loop over all the policies and set them as appropriate
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin(); = this->PolicyMap.begin();
for (;i != this->Policies.end(); ++i) for (;i != this->PolicyMap.end(); ++i)
{ {
if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer)) 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 // 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 // feature is not known about then that is an error
if (this->Policies.find(id) == this->Policies.end()) if (this->PolicyMap.find(id) == this->PolicyMap.end())
{ {
if (status == cmPolicies::WARN || if (status == cmPolicies::WARN ||
status == cmPolicies::OLD) 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 // setting it to WARN or OLD when the feature is REQUIRED_ALWAYS
if ((status == cmPolicies::WARN || if ((status == cmPolicies::WARN ||
status == cmPolicies::OLD) && status == cmPolicies::OLD) &&
this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS) this->PolicyMap[id]->Status == cmPolicies::REQUIRED_ALWAYS)
{ {
cmOStringStream error; cmOStringStream error;
error << error <<
@ -244,7 +244,7 @@ bool cmPolicies::IsValidPolicyStatus(cmPolicies::PolicyID id,
"question is feature " << "question is feature " <<
id << id <<
" which had new behavior introduced in CMake version " << " which had new behavior introduced in CMake version " <<
this->Policies[id]->GetVersionString() << this->PolicyMap[id]->GetVersionString() <<
" please either update your CMakeLists files to conform to " << " please either update your CMakeLists files to conform to " <<
"the new behavior " << "the new behavior " <<
"or use an older version of CMake that still supports " << "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 // 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 // feature is not known about then that is an error
if (this->Policies.find(id) == this->Policies.end()) if (this->PolicyMap.find(id) == this->PolicyMap.end())
{ {
if (status == cmPolicies::WARN || if (status == cmPolicies::WARN ||
status == cmPolicies::OLD) 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 // setting it to WARN or OLD when the feature is REQUIRED_ALWAYS
if ((status == cmPolicies::WARN || if ((status == cmPolicies::WARN ||
status == cmPolicies::OLD) && status == cmPolicies::OLD) &&
(this->Policies[id]->Status == cmPolicies::REQUIRED_ALWAYS || (this->PolicyMap[id]->Status == cmPolicies::REQUIRED_ALWAYS ||
this->Policies[id]->Status == cmPolicies::REQUIRED_IF_USED)) this->PolicyMap[id]->Status == cmPolicies::REQUIRED_IF_USED))
{ {
cmOStringStream error; cmOStringStream error;
error << error <<
@ -294,7 +294,7 @@ bool cmPolicies::IsValidUsedPolicyStatus(cmPolicies::PolicyID id,
"question is feature " << "question is feature " <<
id << id <<
" which had new behavior introduced in CMake version " << " which had new behavior introduced in CMake version " <<
this->Policies[id]->GetVersionString() << this->PolicyMap[id]->GetVersionString() <<
" please either update your CMakeLists files to conform to " << " please either update your CMakeLists files to conform to " <<
"the new behavior " << "the new behavior " <<
"or use an older version of CMake that still supports " << "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::string cmPolicies::GetPolicyIDString(cmPolicies::PolicyID pid)
{ {
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(pid); this->PolicyMap.find(pid);
if (pos == this->Policies.end()) if (pos == this->PolicyMap.end())
{ {
return ""; return "";
} }
@ -339,8 +339,8 @@ std::string cmPolicies::GetPolicyIDString(cmPolicies::PolicyID pid)
std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id) std::string cmPolicies::GetPolicyWarning(cmPolicies::PolicyID id)
{ {
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(id); this->PolicyMap.find(id);
if (pos == this->Policies.end()) if (pos == this->PolicyMap.end())
{ {
cmSystemTools::Error( cmSystemTools::Error(
"Request for warning text for undefined policy!"); "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::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id)
{ {
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(id); this->PolicyMap.find(id);
if (pos == this->Policies.end()) if (pos == this->PolicyMap.end())
{ {
cmSystemTools::Error( cmSystemTools::Error(
"Request for error text for undefined policy!"); "Request for error text for undefined policy!");
@ -399,8 +399,8 @@ cmPolicies::GetPolicyStatus(cmPolicies::PolicyID id)
{ {
// if the policy is not know then what? // if the policy is not know then what?
std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos = std::map<cmPolicies::PolicyID,cmPolicy *>::iterator pos =
this->Policies.find(id); this->PolicyMap.find(id);
if (pos == this->Policies.end()) if (pos == this->PolicyMap.end())
{ {
// TODO is this right? // TODO is this right?
return cmPolicies::WARN; return cmPolicies::WARN;

2
Source/cmPolicies.h
View File

@ -78,7 +78,7 @@ public:
std::string GetRequiredPolicyError(cmPolicies::PolicyID id); std::string GetRequiredPolicyError(cmPolicies::PolicyID id);
private: private:
std::map<cmPolicies::PolicyID,cmPolicy *> Policies; std::map<cmPolicies::PolicyID,cmPolicy *> PolicyMap;
std::map<std::string,cmPolicies::PolicyID> PolicyStringMap; std::map<std::string,cmPolicies::PolicyID> PolicyStringMap;
}; };