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/actorspritemanager.cpp | |
| 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/actorspritemanager.cpp')
| -rw-r--r-- | src/actorspritemanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index ae644c3cd..4cbf157ff 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -308,7 +308,7 @@ Being *ActorSpriteManager::findBeing(const int x, const int y, beingFinder.y = static_cast<uint16_t>(y); beingFinder.type = type; - const ActorSpritesConstIterator it = find_if( + const ActorSpritesConstIterator it = std::find_if( mActors.begin(), mActors.end(), beingFinder); return (it == mActors.end()) ? nullptr : static_cast<Being*>(*it); @@ -957,7 +957,7 @@ Being *ActorSpriteManager::findNearestLivingBeing(const Being *const beingSorter.attackBeings = nullptr; beingSorter.priorityBeings = nullptr; } - sort(sortedBeings.begin(), sortedBeings.end(), beingSorter); + std::sort(sortedBeings.begin(), sortedBeings.end(), beingSorter); if (filtered) { beingSorter.attackBeings = nullptr; @@ -978,8 +978,8 @@ Being *ActorSpriteManager::findNearestLivingBeing(const Being *const } beingEqualFinder.findBeing = player_node->getTarget(); - std::vector<Being*>::const_iterator i = find_if(sortedBeings.begin(), - sortedBeings.end(), beingEqualFinder); + std::vector<Being*>::const_iterator i = std::find_if( + sortedBeings.begin(), sortedBeings.end(), beingEqualFinder); if (i == sortedBeings.end() || ++i == sortedBeings.end()) { |