Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use std::multiset::iterator instead of std::set::iterator with std::multiset. 

Apparently, the iterators were compatible, in some library implementations.
master
Cyp 2012-08-11 07:09:38 +02:00
parent c9fa97ca80
commit 5b9a496b1a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ivis_opengl/bitimage.cpp
View File

@ -66,7 +66,7 @@ inline void ImageMerge::arrange()
{
--r;
std::set<ImageMergeRectangle>::iterator f = freeSpace.lower_bound(*r); // Find smallest free rectangle which is large enough.
std::multiset<ImageMergeRectangle>::iterator f = freeSpace.lower_bound(*r); // Find smallest free rectangle which is large enough.
while (f != freeSpace.end() && (f->siz.x < r->siz.x || f->siz.y < r->siz.y))
{
++f; // Rectangle has wrong shape.