diff options
author | Brad King <brad.king@kitware.com> | 2016-04-14 15:02:40 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-04-15 12:32:15 (GMT) |
commit | b6ed71b17c888c5f79129871bf7bc865b43063e3 (patch) | |
tree | 42fbbd91be4ff04f178ae473eaea5718f279c382 | |
parent | a559f0f6b020697a064517637ae04f0733ffc6ea (diff) | |
download | CMake-b6ed71b17c888c5f79129871bf7bc865b43063e3.zip CMake-b6ed71b17c888c5f79129871bf7bc865b43063e3.tar.gz CMake-b6ed71b17c888c5f79129871bf7bc865b43063e3.tar.bz2 |
cmMakefile: Move cmMakefileCall to .cxx file
-rw-r--r-- | Source/cmMakefile.cxx | 33 | ||||
-rw-r--r-- | Source/cmMakefile.h | 13 |
2 files changed, 20 insertions, 26 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7be6b88..162d3e7 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -222,6 +222,26 @@ void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const cmSystemTools::Message(msg.str().c_str()); } +// Helper class to make sure the call stack is valid. +class cmMakefileCall +{ +public: + cmMakefileCall(cmMakefile* mf, const cmCommandContext& lfc, + cmExecutionStatus& status): Makefile(mf) + { + this->Makefile->ContextStack.push_back(&lfc); + this->Makefile->ExecutionStatusStack.push_back(&status); + } + + ~cmMakefileCall() + { + this->Makefile->ExecutionStatusStack.pop_back(); + this->Makefile->ContextStack.pop_back(); + } +private: + cmMakefile* Makefile; +}; + //---------------------------------------------------------------------------- bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff, cmExecutionStatus &status) @@ -5148,16 +5168,3 @@ cmMakefile::MacroPushPop::~MacroPushPop() { this->Makefile->PopMacroScope(this->ReportError); } - -cmMakefileCall::cmMakefileCall(cmMakefile* mf, const cmCommandContext& lfc, - cmExecutionStatus& status): Makefile(mf) -{ - this->Makefile->ContextStack.push_back(&lfc); - this->Makefile->ExecutionStatusStack.push_back(&status); -} - -cmMakefileCall::~cmMakefileCall() -{ - this->Makefile->ExecutionStatusStack.pop_back(); - this->Makefile->ContextStack.pop_back(); -} diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 45f2efb..7217944 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -959,17 +959,4 @@ private: mutable bool SuppressWatches; }; -//---------------------------------------------------------------------------- -// Helper class to make sure the call stack is valid. -class cmMakefileCall -{ -public: - cmMakefileCall(cmMakefile* mf, - cmCommandContext const& lfc, - cmExecutionStatus& status); - ~cmMakefileCall(); -private: - cmMakefile* Makefile; -}; - #endif |