summaryrefslogtreecommitdiffhomepage
path: root/main
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-21 14:20:16 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-21 14:20:16 +0200
commit7a38c6c434e03256d9e9fbff87516b3ad1e3958a (patch)
tree2cb34a9613fc7f50a6bd7dc0d03eca448e3f5567 /main
parent9a0d8a428b21a77272380009d97436b0a5f20d8c (diff)
macro shenanigans
Diffstat (limited to 'main')
-rw-r--r--main/editor.hpp2
-rw-r--r--main/keyboard.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/editor.hpp b/main/editor.hpp
index 88740b35..4214ec5e 100644
--- a/main/editor.hpp
+++ b/main/editor.hpp
@@ -75,7 +75,7 @@ struct editor final
editor();
editor(editor&&) noexcept = default;
editor& operator=(editor&&) noexcept = default;
- DECLARE_DELETED_COPY_ASSIGNMENT(editor);
+ fm_DECLARE_DELETED_COPY_ASSIGNMENT(editor);
private:
tile_type _floor{editor_mode::floor, "floor"};
diff --git a/main/keyboard.cpp b/main/keyboard.cpp
index 267971b2..90be44e2 100644
--- a/main/keyboard.cpp
+++ b/main/keyboard.cpp
@@ -9,7 +9,7 @@ void app::do_key(KeyEvent::Key k, KeyEvent::Modifiers m, bool pressed, bool repe
(void)m;
(void)repeated;
- const key x = progn(switch (k) {
+ const key x = fm_begin(switch (k) {
using enum KeyEvent::Key;
using enum key;