From 7a38c6c434e03256d9e9fbff87516b3ad1e3958a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 21 Oct 2022 14:20:16 +0200 Subject: macro shenanigans --- src/chunk.hpp | 2 +- src/tile.hpp | 2 +- src/world.hpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/chunk.hpp b/src/chunk.hpp index 9e41c5fb..5e4f5392 100644 --- a/src/chunk.hpp +++ b/src/chunk.hpp @@ -37,7 +37,7 @@ struct chunk final chunk() = default; chunk(chunk&&) = default; chunk& operator=(chunk&&) = default; - DECLARE_DELETED_COPY_ASSIGNMENT(chunk); + fm_DECLARE_DELETED_COPY_ASSIGNMENT(chunk); private: std::array _tiles = {}; diff --git a/src/tile.hpp b/src/tile.hpp index a58d129a..067df3c7 100644 --- a/src/tile.hpp +++ b/src/tile.hpp @@ -28,7 +28,7 @@ struct tile final constexpr tile() = default; tile(tile&&) = default; - DECLARE_DEPRECATED_COPY_ASSIGNMENT(tile); + fm_DECLARE_DEPRECATED_COPY_ASSIGNMENT(tile); }; } //namespace floormat diff --git a/src/world.hpp b/src/world.hpp index 7c256efc..89bc4feb 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -19,6 +19,8 @@ struct world final void clear(); void collect(); + fm_DECLARE_DELETED_COPY_ASSIGNMENT(world); + private: void maybe_collect(); -- cgit v1.2.3