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

Remove VarRemoved code since it's been superceded

This commit is contained in:
Ben Boeckel 2010-09-16 13:50:39 -04:00
parent 59463ef1a3
commit a8e97f8a08
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmMakefile.cxx
View File

@ -45,7 +45,6 @@ public:
std::stack<cmDefinitions, std::list<cmDefinitions> > VarStack; std::stack<cmDefinitions, std::list<cmDefinitions> > VarStack;
std::stack<std::set<cmStdString> > VarInitStack; std::stack<std::set<cmStdString> > VarInitStack;
std::stack<std::set<cmStdString> > VarUsageStack; std::stack<std::set<cmStdString> > VarUsageStack;
std::set<cmStdString> VarRemoved;
}; };
// default is not to be building executables // default is not to be building executables
@ -1762,15 +1761,6 @@ bool cmMakefile::VariableUsed(const char* var) const
return false; return false;
} }
bool cmMakefile::VariableCleared(const char* var) const
{
if(this->Internal->VarRemoved.find(var) != this->Internal->VarRemoved.end())
{
return true;
}
return false;
}
void cmMakefile::CheckForUnused(const char* reason, const char* name) const void cmMakefile::CheckForUnused(const char* reason, const char* name) const
{ {
if (this->WarnUnused && !this->VariableUsed(name)) if (this->WarnUnused && !this->VariableUsed(name))
@ -1793,7 +1783,6 @@ void cmMakefile::CheckForUnused(const char* reason, const char* name) const
void cmMakefile::RemoveDefinition(const char* name) void cmMakefile::RemoveDefinition(const char* name)
{ {
this->Internal->VarStack.top().Set(name, 0); this->Internal->VarStack.top().Set(name, 0);
this->Internal->VarRemoved.insert(name);
this->Internal->VarInitStack.top().insert(name); this->Internal->VarInitStack.top().insert(name);
this->CheckForUnused("unsetting", name); this->CheckForUnused("unsetting", name);
#ifdef CMAKE_BUILD_WITH_CMAKE #ifdef CMAKE_BUILD_WITH_CMAKE

4
Source/cmMakefile.h
View File

@ -67,10 +67,6 @@ public:
bool VariableInitialized(const char* ) const; bool VariableInitialized(const char* ) const;
/* return true if a variable has been used */ /* return true if a variable has been used */
bool VariableUsed(const char* ) const; bool VariableUsed(const char* ) const;
/* return true if a variable has been set with
set(foo )
*/
bool VariableCleared(const char* ) const;
/** Return whether compatibility features needed for a version of /** Return whether compatibility features needed for a version of
the cache or lower should be enabled. */ the cache or lower should be enabled. */
bool NeedCacheCompatibility(int major, int minor); bool NeedCacheCompatibility(int major, int minor);