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

cmPolicies: Enable RVO for internal method.

This commit is contained in:
Stephen Kelly 2015-07-06 01:55:29 +02:00
parent 71e69fc93b
commit 3c45471c2d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -4770,6 +4770,7 @@ cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const
cmPolicies::PolicyStatus cmPolicies::PolicyStatus
cmMakefile::GetPolicyStatusInternal(cmPolicies::PolicyID id) const cmMakefile::GetPolicyStatusInternal(cmPolicies::PolicyID id) const
{ {
cmPolicies::PolicyStatus status = cmPolicies::GetPolicyStatus(id);
cmLocalGenerator* lg = this->LocalGenerator; cmLocalGenerator* lg = this->LocalGenerator;
while(lg) while(lg)
{ {
@ -4779,14 +4780,15 @@ cmMakefile::GetPolicyStatusInternal(cmPolicies::PolicyID id) const
{ {
if(psi->IsDefined(id)) if(psi->IsDefined(id))
{ {
return psi->Get(id); status = psi->Get(id);
return status;
} }
} }
lg = lg->GetParent(); lg = lg->GetParent();
} }
// The policy is not set. Use the default for this CMake version. // The policy is not set. Use the default for this CMake version.
return cmPolicies::GetPolicyStatus(id); return status;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------