From ccf76c6e4cfd9fc7b04db099f7e165cda2336096 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Sat, 23 Mar 2019 16:18:41 +0100 Subject: cmTarget: Move member `TLLCommands` to impl --- Source/cmTarget.cxx | 12 +++++++----- Source/cmTarget.h | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index d3b2e1d..6dd7887 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -188,6 +188,8 @@ public: std::vector LinkDirectoriesBacktraces; std::vector LinkImplementationPropertyEntries; std::vector LinkImplementationPropertyBacktraces; + std::vector> + TLLCommands; cmListFileBacktrace Backtrace; }; @@ -738,13 +740,13 @@ bool cmTarget::PushTLLCommandTrace(TLLSignature signature, cmListFileContext const& lfc) { bool ret = true; - if (!this->TLLCommands.empty()) { - if (this->TLLCommands.back().first != signature) { + if (!impl->TLLCommands.empty()) { + if (impl->TLLCommands.back().first != signature) { ret = false; } } - if (this->TLLCommands.empty() || this->TLLCommands.back().second != lfc) { - this->TLLCommands.emplace_back(signature, lfc); + if (impl->TLLCommands.empty() || impl->TLLCommands.back().second != lfc) { + impl->TLLCommands.emplace_back(signature, lfc); } return ret; } @@ -755,7 +757,7 @@ void cmTarget::GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const (sig == cmTarget::KeywordTLLSignature ? "keyword" : "plain"); s << "The uses of the " << sigString << " signature are here:\n"; cmStateDirectory cmDir = impl->Makefile->GetStateSnapshot().GetDirectory(); - for (auto const& cmd : this->TLLCommands) { + for (auto const& cmd : impl->TLLCommands) { if (cmd.first == sig) { cmListFileContext lfc = cmd.second; lfc.FilePath = cmDir.ConvertToRelPathIfNotContained( diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 8b51c93..860a18e 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -303,7 +303,6 @@ private: std::vector PreBuildCommands; std::vector PreLinkCommands; std::vector PostBuildCommands; - std::vector> TLLCommands; cmTargetInternalPointer impl; bool HaveInstallRule; bool DLLPlatform; -- cgit v0.12