Commit db74ce58 authored by Stephen Kelly's avatar Stephen Kelly
Browse files

cmMakefile: Inline PushScope into PushFunctionScope.

Make it possible to group the various methods here a different way.
parent ca140c2e
...@@ -1564,7 +1564,13 @@ void cmMakefile::InitializeFromParent() ...@@ -1564,7 +1564,13 @@ void cmMakefile::InitializeFromParent()
void cmMakefile::PushFunctionScope(const cmPolicies::PolicyMap& pm) void cmMakefile::PushFunctionScope(const cmPolicies::PolicyMap& pm)
{ {
this->PushScope(); this->Internal->PushDefinitions();
this->PushLoopBlockBarrier();
#if defined(CMAKE_BUILD_WITH_CMAKE)
this->GetGlobalGenerator()->GetFileLockPool().PushFunctionScope();
#endif
this->PushFunctionBlockerBarrier(); this->PushFunctionBlockerBarrier();
...@@ -1579,7 +1585,15 @@ void cmMakefile::PopFunctionScope(bool reportError) ...@@ -1579,7 +1585,15 @@ void cmMakefile::PopFunctionScope(bool reportError)
this->PopFunctionBlockerBarrier(reportError); this->PopFunctionBlockerBarrier(reportError);
this->PopScope(); #if defined(CMAKE_BUILD_WITH_CMAKE)
this->GetGlobalGenerator()->GetFileLockPool().PopFunctionScope();
#endif
this->PopLoopBlockBarrier();
this->CheckForUnusedVariables();
this->Internal->PopDefinitions();
} }
void cmMakefile::PushMacroScope(const cmPolicies::PolicyMap& pm) void cmMakefile::PushMacroScope(const cmPolicies::PolicyMap& pm)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment