kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Remove redundant conditions.

Browse Source 
This container is never empty.
This commit is contained in:
Stephen Kelly 2015-05-17 12:07:10 +02:00
parent caff8e5a3e
commit c42f0e2b3e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMakefile.cxx
View File

@ -1730,8 +1730,7 @@ void cmMakefile::AddDefinition(const std::string& name, const char* value)
} }
this->Internal->SetDefinition(name, value); this->Internal->SetDefinition(name, value);
if (!this->Internal->VarUsageStack.empty() && if (this->VariableInitialized(name))
this->VariableInitialized(name))
{ {
this->CheckForUnused("changing definition", name); this->CheckForUnused("changing definition", name);
this->Internal->VarUsageStack.top().erase(name); this->Internal->VarUsageStack.top().erase(name);
@ -1806,8 +1805,7 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
void cmMakefile::AddDefinition(const std::string& name, bool value) void cmMakefile::AddDefinition(const std::string& name, bool value)
{ {
this->Internal->SetDefinition(name, value ? "ON" : "OFF"); this->Internal->SetDefinition(name, value ? "ON" : "OFF");
if (!this->Internal->VarUsageStack.empty() && if (this->VariableInitialized(name))
this->VariableInitialized(name))
{ {
this->CheckForUnused("changing definition", name); this->CheckForUnused("changing definition", name);
this->Internal->VarUsageStack.top().erase(name); this->Internal->VarUsageStack.top().erase(name);
@ -1904,8 +1902,7 @@ void cmMakefile::CheckForUnused(const char* reason,
void cmMakefile::RemoveDefinition(const std::string& name) void cmMakefile::RemoveDefinition(const std::string& name)
{ {
this->Internal->RemoveDefinition(name); this->Internal->RemoveDefinition(name);
if (!this->Internal->VarUsageStack.empty() && if (this->VariableInitialized(name))
this->VariableInitialized(name))
{ {
this->CheckForUnused("unsetting", name); this->CheckForUnused("unsetting", name);
this->Internal->VarUsageStack.top().erase(name); this->Internal->VarUsageStack.top().erase(name);