From 5b9a496b1a5dd3f1d63e0f035561bd750266d2da Mon Sep 17 00:00:00 2001 From: Cyp Date: Sat, 11 Aug 2012 07:09:38 +0200 Subject: [PATCH] Use std::multiset::iterator instead of std::set::iterator with std::multiset. Apparently, the iterators were compatible, in some library implementations. --- lib/ivis_opengl/bitimage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ivis_opengl/bitimage.cpp b/lib/ivis_opengl/bitimage.cpp index 46aa18887..1a3faa9a7 100644 --- a/lib/ivis_opengl/bitimage.cpp +++ b/lib/ivis_opengl/bitimage.cpp @@ -66,7 +66,7 @@ inline void ImageMerge::arrange() { --r; - std::set::iterator f = freeSpace.lower_bound(*r); // Find smallest free rectangle which is large enough. + std::multiset::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.