summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-17 14:28:39 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-19 20:36:52 (GMT)
commit528d68021c6769b2aa86ea9751a7308a84101ca2 (patch)
treed13252ab049278e611b1d11b5469395fc1182da9
parent9118b53b79afc1791d920b8ea6f9cedf26010148 (diff)
downloadCMake-528d68021c6769b2aa86ea9751a7308a84101ca2.zip
CMake-528d68021c6769b2aa86ea9751a7308a84101ca2.tar.gz
CMake-528d68021c6769b2aa86ea9751a7308a84101ca2.tar.bz2
cmMakefile: Use more suitable method name to log var usage.
-rw-r--r--Source/cmMakefile.cxx12
-rw-r--r--Source/cmMakefile.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ad48bb7..645a433 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1722,7 +1722,7 @@ void cmMakefile::AddDefinition(const std::string& name, const char* value)
this->Internal->SetDefinition(name, value);
if (this->VariableInitialized(name))
{
- this->CheckForUnused("changing definition", name);
+ this->LogUnused("changing definition", name);
this->Internal->VarUsageStack.top().erase(name);
}
this->Internal->VarInitStack.top().insert(name);
@@ -1797,7 +1797,7 @@ void cmMakefile::AddDefinition(const std::string& name, bool value)
this->Internal->SetDefinition(name, value ? "ON" : "OFF");
if (this->VariableInitialized(name))
{
- this->CheckForUnused("changing definition", name);
+ this->LogUnused("changing definition", name);
this->Internal->VarUsageStack.top().erase(name);
}
this->Internal->VarInitStack.top().insert(name);
@@ -1821,7 +1821,7 @@ void cmMakefile::CheckForUnusedVariables() const
std::vector<std::string>::const_iterator it = locals.begin();
for (; it != locals.end(); ++it)
{
- this->CheckForUnused("out of scope", *it);
+ this->LogUnused("out of scope", *it);
}
}
@@ -1850,7 +1850,7 @@ bool cmMakefile::VariableUsed(const std::string& var) const
return false;
}
-void cmMakefile::CheckForUnused(const char* reason,
+void cmMakefile::LogUnused(const char* reason,
const std::string& name) const
{
if (this->WarnUnused && !this->VariableUsed(name))
@@ -1894,7 +1894,7 @@ void cmMakefile::RemoveDefinition(const std::string& name)
this->Internal->RemoveDefinition(name);
if (this->VariableInitialized(name))
{
- this->CheckForUnused("unsetting", name);
+ this->LogUnused("unsetting", name);
this->Internal->VarUsageStack.top().erase(name);
}
this->Internal->VarInitStack.top().insert(name);
@@ -4347,7 +4347,7 @@ void cmMakefile::PopScope()
init.erase(*it);
if (!this->VariableUsed(*it))
{
- this->CheckForUnused("out of scope", *it);
+ this->LogUnused("out of scope", *it);
}
else
{
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 9054472..a8873ff 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -823,7 +823,7 @@ protected:
void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
// Check for a an unused variable
- void CheckForUnused(const char* reason, const std::string& name) const;
+ void LogUnused(const char* reason, const std::string& name) const;
std::string ProjectName; // project name