Don't use std::forward in a loop

This could be a use after move.

Author: joto

src/geom-functions.hpp

@@ -43,13 +43,13 @@ point_t interpolate(point_t p1, point_t p2, double frac) noexcept;
  * \pre \code !list.empty() \endcode
  */
 template <typename FUNC>
-void for_each_segment(point_list_t const &list, FUNC &&func)
+void for_each_segment(point_list_t const &list, FUNC const &func)
 {
     assert(!list.empty());
     auto it = list.cbegin();
     auto prev = it;
     for (++it; it != list.cend(); ++it) {
-        std::forward<FUNC>(func)(*prev, *it);
+        func(*prev, *it);
         prev = it;
     }
 }

src/lua-utils.hpp

@@ -40,14 +40,14 @@ void luaX_add_table_func(lua_State *lua_state, char const *key,
 
 template <typename COLLECTION, typename FUNC>
 void luaX_add_table_array(lua_State *lua_state, char const *key,
-                          COLLECTION const &collection, FUNC &&func)
+                          COLLECTION const &collection, FUNC const &func)
 {
     lua_pushstring(lua_state, key);
     lua_createtable(lua_state, (int)collection.size(), 0);
     int n = 0;
     for (auto const &member : collection) {
         lua_pushinteger(lua_state, ++n);
-        std::forward<FUNC>(func)(member);
+        func(member);
         lua_rawset(lua_state, -3);
     }
     lua_rawset(lua_state, -3);
@@ -99,15 +99,15 @@ bool luaX_is_array(lua_State *lua_state);
  * \post Stack is unchanged.
  */
 template <typename FUNC>
-void luaX_for_each(lua_State *lua_state, FUNC &&func)
+void luaX_for_each(lua_State *lua_state, FUNC const &func)
 {
     assert(lua_istable(lua_state, -1));
     lua_pushnil(lua_state);
     while (lua_next(lua_state, -2) != 0) {
 #ifndef NDEBUG
         int const top = lua_gettop(lua_state);
 #endif
-        std::forward<FUNC>(func)();
+        func();
         assert(top == lua_gettop(lua_state));
         lua_pop(lua_state, 1);
     }

src/tile.hpp

@@ -281,14 +281,14 @@ class tile_t
  */
 template <class OUTPUT>
 std::size_t for_each_tile(quadkey_list_t const &tiles_at_maxzoom,
-                          uint32_t minzoom, uint32_t maxzoom, OUTPUT &&output)
+                          uint32_t minzoom, uint32_t maxzoom,
+                          OUTPUT const &output)
 {
     assert(minzoom <= maxzoom);
 
     if (minzoom == maxzoom) {
         for (auto const quadkey : tiles_at_maxzoom) {
-            std::forward<OUTPUT>(output)(
-                tile_t::from_quadkey(quadkey, maxzoom));
+            output(tile_t::from_quadkey(quadkey, maxzoom));
         }
         return tiles_at_maxzoom.size();
     }
@@ -309,8 +309,7 @@ std::size_t for_each_tile(quadkey_list_t const &tiles_at_maxzoom,
              * the first sibling.
              */
             if (qt_current != last_quadkey.down(dz)) {
-                std::forward<OUTPUT>(output)(
-                    tile_t::from_quadkey(qt_current, maxzoom - dz));
+                output(tile_t::from_quadkey(qt_current, maxzoom - dz));
                 ++count;
             }
         }