From 8e45c1128cd6546a87d7ee32ace91950016f5233 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Tue, 23 Nov 2010 21:53:35 +0100 Subject: [PATCH] Fix indentation in cmPolicies::ApplyPolicyVersion() Alex --- Source/cmPolicies.cxx | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 3fe92de7c..d147a3b64 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -495,9 +495,9 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf, std::string ver = "2.4.0"; if (version && strlen(version) > 0) - { + { ver = version; - } + } unsigned int majorVer = 2; unsigned int minorVer = 0; @@ -556,29 +556,28 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf, // now loop over all the policies and set them as appropriate std::vector ancientPolicies; - std::map::iterator i - = this->Policies.begin(); - for (;i != this->Policies.end(); ++i) - { - if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer,tweakVer)) + for(std::map::iterator i + = this->Policies.begin(); i != this->Policies.end(); ++i) { + if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer,tweakVer)) + { if(i->second->Status == cmPolicies::REQUIRED_ALWAYS) - { + { ancientPolicies.push_back(i->first); - } + } else if (!mf->SetPolicy(i->second->ID, cmPolicies::WARN)) - { + { return false; + } } - } else - { - if (!mf->SetPolicy(i->second->ID, cmPolicies::NEW)) { + if (!mf->SetPolicy(i->second->ID, cmPolicies::NEW)) + { return false; + } } } - } // Make sure the project does not use any ancient policies. if(!ancientPolicies.empty())