FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added catch of erase of the last element of heap.

Browse Source
This commit is contained in:
Robert Osfield 2005-11-15 14:25:03 +00:00
parent 20ce2ada9f
commit 76f7f77883
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgUtil/TriStrip_heap_array.h
View File

@ -204,13 +204,22 @@ inline void heap_array<T, CmpT>::erase(size_t i) {
m_Locked = true;
// Debug check to ensure element is still present
// assert(! removed(i));
if (removed(i)) throw "heap_array<T, CmpT>::erase(size_t i) error";
size_t j = m_Finder[i];
Swap(j, size() - 1);
m_Heap.pop_back();
Adjust(j);
if (j==m_Heap.size()-1)
{
m_Heap.pop_back();
}
else
{
Swap(j, size() - 1);
m_Heap.pop_back();
Adjust(j);
}
}