TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

dtoolbase: More elegant fix for NeverFreeMemory memory leak

Browse Source 
Better fix for 74983d19a41d5fbf006cb269d6b1adc9f705dc99 is to just switch to an std::multimap.  This couldn't go in the 1.10.x branch due to the risk of ABI change.
This commit is contained in:
rdb 2020-12-20 00:39:24 +01:00
parent dee8df9427
commit ae3d8c2663
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtool/src/dtoolbase/neverFreeMemory.I
View File

@ -80,11 +80,7 @@ Page(void *start, size_t size) :
*/ */
INLINE bool NeverFreeMemory::Page:: INLINE bool NeverFreeMemory::Page::
operator < (const NeverFreeMemory::Page &other) const { operator < (const NeverFreeMemory::Page &other) const {
if (_remaining != other._remaining) { return _remaining < other._remaining;
return _remaining < other._remaining;
} else {
return _next < other._next;
}
} }
/** /**

2
dtool/src/dtoolbase/neverFreeMemory.h
View File

@ -57,7 +57,7 @@ private:
size_t _remaining; size_t _remaining;
}; };
typedef std::set<Page> Pages; typedef std::multiset<Page> Pages;
Pages _pages; Pages _pages;
size_t _total_alloc; size_t _total_alloc;