Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

issue with OS X and std::set, erase doesn't return an iterator. todo: check this

Browse Source
This commit is contained in:
ejcoumans
2006-09-19 07:06:23 +00:00
parent d375a474b3
commit eb6664f7c2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Bullet/BroadphaseCollision/OverlappingPairCache.cpp
View File

@@ -176,7 +176,13 @@ void OverlappingPairCache::ProcessAllOverlappingPairs(OverlapCallback* callback)
BroadphasePair* pair = (BroadphasePair*)(&(*it)); BroadphasePair* pair = (BroadphasePair*)(&(*it));
if (callback->ProcessOverlap(*pair)) if (callback->ProcessOverlap(*pair))
{ {
it = m_overlappingPairSet.erase(it); CleanOverlappingPair(*pair);
\
std::set<BroadphasePair>::iterator it2 = it;
it++;
//why does next line not compile under OS X??
//it = m_overlappingPairSet.erase(it2);
m_overlappingPairSet.erase(it2);
} else } else
{ {
it++; it++;