summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.h
diff options
context:
space:
mode:
authorRegina Pfeifer <regina@mailbox.org>2019-07-26 21:45:50 (GMT)
committerRegina Pfeifer <regina@mailbox.org>2019-07-26 22:22:15 (GMT)
commit020478dbeabac4ccbfccb3a92a306e4ea8e84434 (patch)
tree332b36abd2f280b318dbb4c69cbd7c35583fdd31 /Source/cmMakefile.h
parent8ce189720ee8daafed4848ee9eb970f9e0546578 (diff)
downloadCMake-020478dbeabac4ccbfccb3a92a306e4ea8e84434.zip
CMake-020478dbeabac4ccbfccb3a92a306e4ea8e84434.tar.gz
CMake-020478dbeabac4ccbfccb3a92a306e4ea8e84434.tar.bz2
cmMakefile: Keep function blockers in a stack
Highlight the fact that we only ever operate on the top element.
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r--Source/cmMakefile.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 18b81d4..73ef0e2 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -20,7 +20,6 @@
#include "cm_string_view.hxx"
#include "cmAlgorithms.h"
-#include "cmFunctionBlocker.h"
#include "cmListFileCache.h"
#include "cmMessageType.h"
#include "cmNewLineStyle.h"
@@ -39,6 +38,7 @@ class cmCustomCommandLines;
class cmExecutionStatus;
class cmExpandedCommandArgument;
class cmExportBuildFileGenerator;
+class cmFunctionBlocker;
class cmGeneratorExpressionEvaluationFile;
class cmGlobalGenerator;
class cmInstallGenerator;
@@ -963,7 +963,9 @@ private:
bool EnforceUniqueDir(const std::string& srcPath,
const std::string& binPath) const;
- typedef std::vector<std::unique_ptr<cmFunctionBlocker>> FunctionBlockersType;
+ using FunctionBlockerPtr = std::unique_ptr<cmFunctionBlocker>;
+ using FunctionBlockersType =
+ std::stack<FunctionBlockerPtr, std::vector<FunctionBlockerPtr>>;
FunctionBlockersType FunctionBlockers;
std::vector<FunctionBlockersType::size_type> FunctionBlockerBarriers;
void PushFunctionBlockerBarrier();