mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-09 23:59:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmGlobalGenerator: Rename member to avoid shadowing

Browse Source 
The `CurrentMakefile` member is shadowed by a generate-time member of
the same name in `cmGlobalXCodeGenerator`.  Rename our member to clarify
its configure-time role and avoid the shadow.
This commit is contained in:
Brad King
2017-06-14 16:24:45 -04:00
parent 877e7383b3
commit c1f15e1c79
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalGenerator.cxx
+1 -1
View File
@@ -90,7 +90,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
this->TryCompileTimeout = 0;
this->ExtraGenerator = CM_NULLPTR;
this->CurrentMakefile = CM_NULLPTR;
this->CurrentConfigureMakefile = CM_NULLPTR;
this->TryCompileOuterMakefile = CM_NULLPTR;
this->ConfigureDoneCMP0026AndCMP0024 = false;
Source/cmGlobalGenerator.h
+9 -3
View File
@@ -187,9 +187,15 @@ public:
return this->LocalGenerators;
}
cmMakefile* GetCurrentMakefile() const { return this->CurrentMakefile; }
cmMakefile* GetCurrentMakefile() const
{
return this->CurrentConfigureMakefile;
}
void SetCurrentMakefile(cmMakefile* mf) { this->CurrentMakefile = mf; }
void SetCurrentMakefile(cmMakefile* mf)
{
this->CurrentConfigureMakefile = mf;
}
void AddMakefile(cmMakefile* mf);
@@ -460,7 +466,7 @@ protected:
cmake* CMakeInstance;
std::vector<cmMakefile*> Makefiles;
std::vector<cmLocalGenerator*> LocalGenerators;
cmMakefile* CurrentMakefile;
cmMakefile* CurrentConfigureMakefile;
// map from project name to vector of local generators in that project
std::map<std::string, std::vector<cmLocalGenerator*> > ProjectMap;