diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/ctor.cpp | 4 | ||||
| -rw-r--r-- | main/main-impl.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/main/ctor.cpp b/main/ctor.cpp index 69f965c9..da38fb18 100644 --- a/main/ctor.cpp +++ b/main/ctor.cpp @@ -10,7 +10,7 @@ namespace floormat { main_impl::main_impl(floormat_app& app, fm_settings&& se, int& argc, char** argv) noexcept : Platform::Sdl2Application{Arguments{argc, argv}, make_conf(se), make_gl_conf(se)}, - s{std::move(se)}, app{app}, _shader{_tuc} + s{move(se)}, app{app}, _shader{_tuc} { if (s.vsync) { @@ -29,7 +29,7 @@ main_impl::main_impl(floormat_app& app, fm_settings&& se, int& argc, char** argv class world& main_impl::reset_world(class world&& w) noexcept { arrayResize(_clickable_scenery, 0); - _world = std::move(w); + _world = move(w); return _world; } diff --git a/main/main-impl.cpp b/main/main-impl.cpp index fde0861d..11561a4a 100644 --- a/main/main-impl.cpp +++ b/main/main-impl.cpp @@ -1,7 +1,6 @@ #include "main-impl.hpp" #include "src/search-astar.hpp" #include "src/search.hpp" -#include <Corrade/Utility/Move.h> #include <Magnum/Platform/Sdl2Application.h> namespace floormat { @@ -37,7 +36,7 @@ int main_impl::exec() floormat_main* floormat_main::create(floormat_app& app, fm_settings&& options) { - auto* ret = new main_impl(app, Utility::move(options), options.argc, const_cast<char**>(options.argv)); + auto* ret = new main_impl(app, move(options), options.argc, const_cast<char**>(options.argv)); return ret; } |