move std::erase_if => util::erase_if

include/llmr/util/std.hpp

@@ -11,6 +11,10 @@ template<typename T, typename ...Args>
     return ::std::unique_ptr<T>(new T(::std::forward<Args>(args)...));
 }
 
+}
+
+namespace llmr {
+namespace util {
 
 template <typename Container, typename ForwardIterator, typename Predicate>
 void erase_if(Container &container, ForwardIterator it, const ForwardIterator end, Predicate pred) {
@@ -28,6 +32,7 @@ void erase_if(Container &container, Predicate pred) {
     erase_if(container, container.begin(), container.end(), pred);
 }
 
+}
 }
 
 #endif

src/geometry/sprite_atlas.cpp

@@ -228,7 +228,7 @@ void SpriteAtlas::update(const Sprite &sprite) {
     if (!sprite.isLoaded()) return;
 
     SpriteAtlas &atlas = *this;
-    std::erase_if(uninitialized, [&sprite, &atlas](const std::string &name) {
+    util::erase_if(uninitialized, [&sprite, &atlas](const std::string &name) {
         Rect<dimension> dst = atlas.getImage(name, sprite);
         const SpritePosition &src = sprite.getSpritePosition(name);
         if (!src) {

src/map/map.cpp

@@ -9,6 +9,7 @@
 #include <llmr/util/string.hpp>
 #include <llmr/util/constants.hpp>
 #include <llmr/util/uv.hpp>
+#include <llmr/util/std.hpp>
 #include <llmr/style/style_layer_group.hpp>
 #include <llmr/style/style_bucket.hpp>
 #include <llmr/geometry/sprite_atlas.hpp>

src/map/source.cpp

@@ -284,7 +284,7 @@ bool Source::updateTiles(Map &map) {
     // Remove tiles that we definitely don't need, i.e. tiles that are not on
     // the required list.
     std::set<Tile::ID> retain_data;
-    std::erase_if(tiles, [&retain, &retain_data, &changed](std::pair<const Tile::ID, std::unique_ptr<Tile>> &pair) {
+    util::erase_if(tiles, [&retain, &retain_data, &changed](std::pair<const Tile::ID, std::unique_ptr<Tile>> &pair) {
         Tile &tile = *pair.second;
         bool obsolete = std::find(retain.begin(), retain.end(), tile.id) == retain.end();
         if (obsolete) {
@@ -296,7 +296,7 @@ bool Source::updateTiles(Map &map) {
     });
 
     // Remove all the expired pointers from the set.
-    std::erase_if(tile_data, [&retain_data](std::pair<const Tile::ID, std::weak_ptr<TileData>> &pair) {
+    util::erase_if(tile_data, [&retain_data](std::pair<const Tile::ID, std::weak_ptr<TileData>> &pair) {
         const std::shared_ptr<TileData> tile = pair.second.lock();
         if (!tile) {
             return true;