diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-07-30 14:03:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-30 14:03:34 (GMT) |
| commit | f799ff43d564fd185e56b3213616da10eb92c11c (patch) | |
| tree | b4c53aa1c6dbaeb2c1d0873f6e95dfe4615b51b2 /Source/cmMakefile.h | |
| parent | ffe555ad886662d39fab835d5ccc986282ad467f (diff) | |
| parent | 020478dbeabac4ccbfccb3a92a306e4ea8e84434 (diff) | |
| download | CMake-f799ff43d564fd185e56b3213616da10eb92c11c.zip CMake-f799ff43d564fd185e56b3213616da10eb92c11c.tar.gz CMake-f799ff43d564fd185e56b3213616da10eb92c11c.tar.bz2 | |
Merge topic 'function-blocker-stack'
020478dbea cmMakefile: Keep function blockers in a stack
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3613
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 6 |
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(); |