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

variable_watch: Prevent making extra entries in the watch map 

When removing a watch on a variable, using the operator [] on the
internal map will create an empty watch if the variable doesn't have any
existing watches. Rather than creating this empty structure in the map,
return if there isn't a watch on the variable already.
This commit is contained in:
Ben Boeckel 2013-08-02 15:49:28 -04:00 committed by Brad King
parent 34b397e8de
commit 00ce12a334
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmVariableWatch.cxx
View File

@ -80,6 +80,10 @@ void cmVariableWatch::RemoveWatch(const std::string& variable,
WatchMethod method, WatchMethod method,
void* client_data /*=0*/) void* client_data /*=0*/)
{ {
if ( !this->WatchMap.count(variable) )
{
return;
}
cmVariableWatch::VectorOfPairs* vp = &this->WatchMap[variable]; cmVariableWatch::VectorOfPairs* vp = &this->WatchMap[variable];
cmVariableWatch::VectorOfPairs::iterator it; cmVariableWatch::VectorOfPairs::iterator it;
for ( it = vp->begin(); it != vp->end(); ++it ) for ( it = vp->begin(); it != vp->end(); ++it )