diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-31 21:45:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-06 07:30:45 (GMT) |
| commit | db74ce5820e0d0a99649c6b472de74277e3fa6bf (patch) | |
| tree | 5760e6ec038851989c26419c8196f0d3192f88b4 /Source | |
| parent | ca140c2e898ca74a7daa305449b136b1294a41f0 (diff) | |
| download | CMake-db74ce5820e0d0a99649c6b472de74277e3fa6bf.zip CMake-db74ce5820e0d0a99649c6b472de74277e3fa6bf.tar.gz CMake-db74ce5820e0d0a99649c6b472de74277e3fa6bf.tar.bz2 | |
cmMakefile: Inline PushScope into PushFunctionScope.
Make it possible to group the various methods here a different way.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index d3a8121..2072418 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1564,7 +1564,13 @@ void cmMakefile::InitializeFromParent() 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(); @@ -1579,7 +1585,15 @@ void cmMakefile::PopFunctionScope(bool 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) |