From 78a3eec9be053a1f82cf2e6235bbaa4deb4a1335 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 28 Feb 2024 18:29:02 +0100
Subject: switch to using unqualified calls to {move,forward,swap}

---
 shaders/lightmap.cpp | 8 ++++----
 shaders/shader.hpp   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'shaders')

diff --git a/shaders/lightmap.cpp b/shaders/lightmap.cpp
index 004a4ace..14bb27e2 100644
--- a/shaders/lightmap.cpp
+++ b/shaders/lightmap.cpp
@@ -48,8 +48,8 @@ template<typename T, typename U>
 GL::Mesh make_light_mesh(T&& vert, U&& index)
 {
     GL::Mesh mesh{GL::MeshPrimitive::Triangles};
-    mesh.addVertexBuffer(std::forward<T>(vert), 0, lightmap_shader::Position{})
-        .setIndexBuffer(std::forward<U>(index), 0, GL::MeshIndexType::UnsignedShort)
+    mesh.addVertexBuffer(forward<T>(vert), 0, lightmap_shader::Position{})
+        .setIndexBuffer(forward<U>(index), 0, GL::MeshIndexType::UnsignedShort)
         .setCount(6);
     return mesh;
 }
@@ -149,8 +149,8 @@ quad& lightmap_shader::alloc_rect()
         occlusion_mesh = GL::Mesh{NoCreate};
         vertex_buf = GL::Buffer{NoCreate};
         index_buf = GL::Buffer{NoCreate};
-        auto vertexes_ = std::move(vertexes);
-        auto indexes_ = std::move(indexes);
+        auto vertexes_ = move(vertexes);
+        auto indexes_ = move(indexes);
         vertexes = Array<std::array<Vector3, 4>>{ValueInit, capacity};
         indexes = Array<std::array<UnsignedShort, 6>>{ValueInit, capacity};
         for (auto i = 0uz; i < count; i++)
diff --git a/shaders/shader.hpp b/shaders/shader.hpp
index 56659218..41f876e1 100644
--- a/shaders/shader.hpp
+++ b/shaders/shader.hpp
@@ -78,7 +78,7 @@ template<typename T, typename... Xs>
 decltype(auto) tile_shader::draw(GL::AbstractTexture& tex, T&& mesh, Xs&&... xs)
 {
     draw_pre(tex);
-    decltype(auto) ret = GL::AbstractShaderProgram::draw(std::forward<T>(mesh), std::forward<Xs>(xs)...);
+    decltype(auto) ret = GL::AbstractShaderProgram::draw(forward<T>(mesh), forward<Xs>(xs)...);
     draw_post(tex);
     return ret;
 }
-- 
cgit v1.2.3