diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-29 16:47:14 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-06 18:16:20 (GMT) |
| commit | bf28b7874b999224782fac72c5a74020bd6c47d3 (patch) | |
| tree | a1559e4feb0b4499932fd3420fe87488c4dd5ec5 /Source | |
| parent | 9d653f9c1cc129be4fdce7f0e93c282760c7603e (diff) | |
| download | CMake-bf28b7874b999224782fac72c5a74020bd6c47d3.zip CMake-bf28b7874b999224782fac72c5a74020bd6c47d3.tar.gz CMake-bf28b7874b999224782fac72c5a74020bd6c47d3.tar.bz2 | |
cmGeneratorTarget: Rename internal member.
Leave the old name available for another use.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 6 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 62598f4..4ed2939 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -406,8 +406,8 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config, std::vector<cmSourceFile*> 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 916f281..6d5641b 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -370,7 +370,7 @@ private: friend class cmTargetTraceDependencies; struct SourceEntry { std::vector<cmSourceFile*> Depends; }; typedef std::map<cmSourceFile const*, SourceEntry> SourceEntriesType; - SourceEntriesType SourceEntries; + SourceEntriesType SourceDepends; mutable std::map<cmSourceFile const*, std::string> Objects; std::set<cmSourceFile const*> ExplicitObjectName; mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache; |