diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-05-06 01:15:52 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-05-06 01:15:52 +0200 |
| commit | e944ceb0f0c084b14f2389c780b1ceb87a212c75 (patch) | |
| tree | 8d2c417f0fee176bcc4ffc83b2dc06b0bbd6ec31 /src | |
| parent | c71dc6be5e506fc316ac6557d6956aa69988e44f (diff) | |
e
Diffstat (limited to 'src')
| -rw-r--r-- | src/critter.cpp | 1 | ||||
| -rw-r--r-- | src/script.cpp | 2 | ||||
| -rw-r--r-- | src/script.hpp | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/critter.cpp b/src/critter.cpp index dc1c1237..42a3e591 100644 --- a/src/critter.cpp +++ b/src/critter.cpp @@ -1,5 +1,4 @@ #include "critter.hpp" - #include "critter-script.hpp" #include "compat/limits.hpp" #include "tile-constants.hpp" diff --git a/src/script.cpp b/src/script.cpp index df9ba473..f2b7d30d 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -7,7 +7,7 @@ namespace { constexpr StringView names[(size_t)script_lifecycle::COUNT] = { - "no-init"_s, "initializing"_s, "created"_s, "destroying"_s, "torn_down"_s, + "no-init"_s, "initializing"_s, "created"_s, "destroying"_s, "torn-down"_s, }; } // namespace diff --git a/src/script.hpp b/src/script.hpp index 755a40df..7493dd28 100644 --- a/src/script.hpp +++ b/src/script.hpp @@ -10,8 +10,7 @@ struct Ns; struct base_script { - fm_DECLARE_DELETED_COPY_ASSIGNMENT(base_script); - fm_DECLARE_DELETED_MOVE_ASSIGNMENT(base_script); + fm_DECLARE_DELETED_COPY_MOVE_ASSIGNMENTS(base_script); constexpr base_script() noexcept = default; virtual ~base_script() noexcept; @@ -29,8 +28,7 @@ class Script final static S* make_empty(); public: - fm_DECLARE_DELETED_COPY_ASSIGNMENT(Script); - fm_DECLARE_DELETED_MOVE_ASSIGNMENT(Script); + fm_DECLARE_DELETED_COPY_MOVE_ASSIGNMENTS(Script); Script(); ~Script() noexcept; |