diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-06-21 17:38:02 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-06-21 18:10:46 (GMT) |
commit | a6e661b848fc180b03e7d72739c9a4a077a97e3f (patch) | |
tree | 0ccf3f179048042da5be16beccdb713bd68d5bf9 | |
parent | fe38bb2c29ab4273cfefb1b343b80388bea2893e (diff) | |
download | CMake-a6e661b848fc180b03e7d72739c9a4a077a97e3f.zip CMake-a6e661b848fc180b03e7d72739c9a4a077a97e3f.tar.gz CMake-a6e661b848fc180b03e7d72739c9a4a077a97e3f.tar.bz2 |
cmMakefile: Rename variables.
-rw-r--r-- | Source/cmMakefile.cxx | 14 | ||||
-rw-r--r-- | Source/cmMakefile.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 9a1f7ef..08c5a0b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -576,12 +576,12 @@ bool cmMakefile::ReadListFile(const char* listfile, this->ListFileStack.push_back(filenametoread); - cmListFile cacheFile; - bool res = cacheFile.ParseFile(filenametoread.c_str(), - requireProjectCommand, this); + cmListFile listFile; + bool res = listFile.ParseFile(filenametoread.c_str(), + requireProjectCommand, this); if (res) { - this->ReadListFileInternal(cacheFile, filenametoread.c_str(), + this->ReadListFileInternal(listFile, filenametoread.c_str(), noPolicyScope); } @@ -601,7 +601,7 @@ bool cmMakefile::ReadListFile(const char* listfile, return res; } -void cmMakefile::ReadListFileInternal(cmListFile const& cacheFile, +void cmMakefile::ReadListFileInternal(cmListFile const& listFile, const char* filenametoread, bool noPolicyScope) { @@ -614,11 +614,11 @@ void cmMakefile::ReadListFileInternal(cmListFile const& cacheFile, IncludeScope incScope(this, filenametoread, noPolicyScope); // Run the parsed commands. - const size_t numberFunctions = cacheFile.Functions.size(); + const size_t numberFunctions = listFile.Functions.size(); for(size_t i =0; i < numberFunctions; ++i) { cmExecutionStatus status; - this->ExecuteCommand(cacheFile.Functions[i],status); + this->ExecuteCommand(listFile.Functions[i],status); if(cmSystemTools::GetFatalErrorOccured()) { // Exit early due to error. diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 5927be1..b80a1ee 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -918,7 +918,7 @@ private: bool noPolicyScope, bool requireProjectCommand); - void ReadListFileInternal(cmListFile const& cacheFile, + void ReadListFileInternal(cmListFile const& listFile, const char* filenametoread, bool noPolicyScope); |