diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-10 14:33:00 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-10 14:33:00 +0300 |
commit | aae328e272cdec136a1367cf83a5873a6b4963a9 (patch) | |
tree | 8388d89d96aca4be2fb506d7978c2d846a05307b /src/gui/widgets | |
parent | 26146784b5a41dd77d31d7713260c1343b575677 (diff) | |
download | manaplus-aae328e272cdec136a1367cf83a5873a6b4963a9.tar.gz manaplus-aae328e272cdec136a1367cf83a5873a6b4963a9.tar.bz2 manaplus-aae328e272cdec136a1367cf83a5873a6b4963a9.tar.xz manaplus-aae328e272cdec136a1367cf83a5873a6b4963a9.zip |
Fix compilation errors with stlport.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/browserbox.cpp | 4 | ||||
-rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 18a9df3e2..cac2a53f2 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -319,7 +319,7 @@ void BrowserBox::mousePressed(gcn::MouseEvent &event) if (!mLinkHandler) return; - const LinkIterator i = find_if(mLinks.begin(), mLinks.end(), + const LinkIterator i = std::find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); if (i != mLinks.end()) @@ -328,7 +328,7 @@ void BrowserBox::mousePressed(gcn::MouseEvent &event) void BrowserBox::mouseMoved(gcn::MouseEvent &event) { - const LinkIterator i = find_if(mLinks.begin(), mLinks.end(), + const LinkIterator i = std::find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); mSelectedLink = (i != mLinks.end()) diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 4ccfb566f..e12a15a6b 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -535,19 +535,21 @@ void ItemContainer::updateMatrix() default: break; case 1: - sort(sortedItems.begin(), sortedItems.end(), itemAlphaSorter); + std::sort(sortedItems.begin(), sortedItems.end(), itemAlphaSorter); break; case 2: - sort(sortedItems.begin(), sortedItems.end(), itemIdSorter); + std::sort(sortedItems.begin(), sortedItems.end(), itemIdSorter); break; case 3: - sort(sortedItems.begin(), sortedItems.end(), itemWeightSorter); + std::sort(sortedItems.begin(), sortedItems.end(), + itemWeightSorter); break; case 4: - sort(sortedItems.begin(), sortedItems.end(), itemAmountSorter); + std::sort(sortedItems.begin(), sortedItems.end(), + itemAmountSorter); break; case 5: - sort(sortedItems.begin(), sortedItems.end(), itemTypeSorter); + std::sort(sortedItems.begin(), sortedItems.end(), itemTypeSorter); break; } |