From 3c45471c2d4a0c08b88f10161d4b166a27165e31 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 6 Jul 2015 01:55:29 +0200
Subject: cmPolicies: Enable RVO for internal method.

---
 Source/cmMakefile.cxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 36b42bd..cae7bbc 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4770,6 +4770,7 @@ cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const
 cmPolicies::PolicyStatus
 cmMakefile::GetPolicyStatusInternal(cmPolicies::PolicyID id) const
 {
+  cmPolicies::PolicyStatus status = cmPolicies::GetPolicyStatus(id);
   cmLocalGenerator* lg = this->LocalGenerator;
   while(lg)
     {
@@ -4779,14 +4780,15 @@ cmMakefile::GetPolicyStatusInternal(cmPolicies::PolicyID id) const
       {
       if(psi->IsDefined(id))
         {
-        return psi->Get(id);
+        status = psi->Get(id);
+        return status;
         }
       }
     lg = lg->GetParent();
     }
 
   // The policy is not set.  Use the default for this CMake version.
-  return cmPolicies::GetPolicyStatus(id);
+  return status;
 }
 
 //----------------------------------------------------------------------------
-- 
cgit v0.12