From a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 10 Oct 2015 13:20:09 +0200 Subject: [PATCH] cmTarget: Move backtrace member out of internal class. --- Source/cmTarget.cxx | 7 ++----- Source/cmTarget.h | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index fd8ea3e97..369e49717 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType) class cmTargetInternals { public: - // The backtrace when the target was created. - cmListFileBacktrace Backtrace; - typedef std::map ImportInfoMapType; ImportInfoMapType ImportInfoMap; @@ -240,7 +237,7 @@ void cmTarget::SetMakefile(cmMakefile* mf) } // Save the backtrace of target construction. - this->Internal->Backtrace = this->Makefile->GetBacktrace(); + this->Backtrace = this->Makefile->GetBacktrace(); if (!this->IsImported()) { @@ -363,7 +360,7 @@ void cmTarget::FinishConfigure() //---------------------------------------------------------------------------- cmListFileBacktrace const& cmTarget::GetBacktrace() const { - return this->Internal->Backtrace; + return this->Backtrace; } //---------------------------------------------------------------------------- diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 01261ed52..03c4cbeb0 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -471,6 +471,8 @@ private: std::string const& suffix, std::string const& name, const char* version) const; + + cmListFileBacktrace Backtrace; }; #ifdef CMAKE_BUILD_WITH_CMAKE