From bf28b7874b999224782fac72c5a74020bd6c47d3 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Aug 2015 18:47:14 +0200 Subject: [PATCH] cmGeneratorTarget: Rename internal member. Leave the old name available for another use. --- Source/cmGeneratorTarget.cxx | 6 +++--- Source/cmGeneratorTarget.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 62598f439..4ed293919 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -406,8 +406,8 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config, std::vector const* cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const { - SourceEntriesType::const_iterator i = this->SourceEntries.find(sf); - if(i != this->SourceEntries.end()) + SourceEntriesType::const_iterator i = this->SourceDepends.find(sf); + if(i != this->SourceDepends.end()) { return &i->second.Depends; } @@ -1723,7 +1723,7 @@ void cmTargetTraceDependencies::Trace() // Get the next source from the queue. cmSourceFile* sf = this->SourceQueue.front(); this->SourceQueue.pop(); - this->CurrentEntry = &this->GeneratorTarget->SourceEntries[sf]; + this->CurrentEntry = &this->GeneratorTarget->SourceDepends[sf]; // Queue dependencies added explicitly by the user. if(const char* additionalDeps = sf->GetProperty("OBJECT_DEPENDS")) diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 916f2819c..6d5641b5d 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -370,7 +370,7 @@ private: friend class cmTargetTraceDependencies; struct SourceEntry { std::vector Depends; }; typedef std::map SourceEntriesType; - SourceEntriesType SourceEntries; + SourceEntriesType SourceDepends; mutable std::map Objects; std::set ExplicitObjectName; mutable std::map > SystemIncludesCache;