From 2394584ce2fa4ff88bb8b196e5a75fc5f848ba4a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 2 Aug 2015 10:23:12 +0200 Subject: cmGlobalGenerator: Rename progress initializer method. --- Source/cmGlobalGenerator.cxx | 2 +- Source/cmGlobalGenerator.h | 2 +- Source/cmGlobalUnixMakefileGenerator3.cxx | 2 +- Source/cmGlobalUnixMakefileGenerator3.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 2dddc7d..503c455 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1340,7 +1340,7 @@ void cmGlobalGenerator::Generate() // Create a map from local generator to the complete set of targets // it builds by default. - this->FillLocalGeneratorToTargetMap(); + this->InitializeProgressMarks(); for (i = 0; i < this->LocalGenerators.size(); ++i) { diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 86f52af..fe710f1 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -398,7 +398,7 @@ protected: void CheckLocalGenerators(); bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen) const; bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) const; - virtual void FillLocalGeneratorToTargetMap() {} + virtual void InitializeProgressMarks() {} void CreateDefaultGlobalTargets(cmTargets* targets); cmTarget CreateGlobalTarget(const std::string& name, const char* message, const cmCustomCommandLines* commandLines, diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 255b59d..f8dee62 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -919,7 +919,7 @@ cmGlobalUnixMakefileGenerator3 // Build a map that contains a the set of targets used by each local // generator directory level. -void cmGlobalUnixMakefileGenerator3::FillLocalGeneratorToTargetMap() +void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() { this->LocalGeneratorToTargetMap.clear(); // Loop over all targets in all local generators. diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index de7d858..a8f99dd 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -209,7 +209,7 @@ private: std::map > LocalGeneratorToTargetMap; - virtual void FillLocalGeneratorToTargetMap(); + virtual void InitializeProgressMarks(); }; #endif -- cgit v0.12