nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Erase-remove idiom in Island and Bimap to avoid invalid iterators (Nils Mangelsen)

Browse source
This commit is contained in:
quemy 2013-02-07 22:48:41 +01:00
commit d41cbbe781
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
smp/src/bimap.cpp
View file

@ -49,9 +49,9 @@ std::map<B,A> paradiseo::smp::Bimap<A,B>::getLeft() const
template<class A, class B>
void paradiseo::smp::Bimap<A,B>::removeFromRight(const A& a)
{
for(auto& it : leftAssociation)
if(it->second == a)
leftAssociation.erase(it);
leftAssociation.erase(remove(leftAssociation.begin(), leftAssociation.end(),
[&](std::pair<B,A>& i) -> bool { return i->second == a; }),
leftAssociation.end());
rightAssociation.erase(a);
}
@ -59,9 +59,9 @@ void paradiseo::smp::Bimap<A,B>::removeFromRight(const A& a)
template<class A, class B>
void paradiseo::smp::Bimap<A,B>::removeFromLeft(const B& b)
{
for(auto& it : rightAssociation)
if(it->second == b)
rightAssociation.erase(it);
rightAssociation.erase(remove(rightAssociation.begin(), rightAssociation.end(),
[&](std::pair<A,B>& i) -> bool { return i->second == b; }),
rightAssociation.end());
leftAssociation.erase(b);
}