diff options
| -rw-r--r-- | editor/imgui-raii.cpp | 1 | ||||
| -rw-r--r-- | src/anim.cpp | 1 | ||||
| -rw-r--r-- | src/chunk-collision.cpp | 1 | ||||
| -rw-r--r-- | src/chunk-walls.cpp | 1 | ||||
| -rw-r--r-- | src/critter-script-walk.cpp | 1 | ||||
| -rw-r--r-- | src/point.hpp | 4 |
6 files changed, 7 insertions, 2 deletions
diff --git a/editor/imgui-raii.cpp b/editor/imgui-raii.cpp index dd341e2e..7c0ccb8c 100644 --- a/editor/imgui-raii.cpp +++ b/editor/imgui-raii.cpp @@ -1,6 +1,7 @@ #include "imgui-raii.hpp" #include "compat/assert.hpp" #include <cstdio> +#include <utility> #include <Corrade/Containers/StringView.h> #include <Magnum/Magnum.h> #include <Magnum/Math/Color.h> diff --git a/src/anim.cpp b/src/anim.cpp index 717b3ee6..db724154 100644 --- a/src/anim.cpp +++ b/src/anim.cpp @@ -1,6 +1,7 @@ #include "anim.hpp" #include "compat/exception.hpp" #include <cmath> +#include <utility> namespace floormat { diff --git a/src/chunk-collision.cpp b/src/chunk-collision.cpp index 8cc74741..b0170755 100644 --- a/src/chunk-collision.cpp +++ b/src/chunk-collision.cpp @@ -10,6 +10,7 @@ #include "src/hole.hpp" #include "src/wall-atlas.hpp" #include <bit> +#include <utility> #include <Corrade/Containers/StructuredBindings.h> #include <Corrade/Containers/Pair.h> diff --git a/src/chunk-walls.cpp b/src/chunk-walls.cpp index 7d0bd29b..39faf0bd 100644 --- a/src/chunk-walls.cpp +++ b/src/chunk-walls.cpp @@ -9,6 +9,7 @@ #include <cr/ArrayViewStl.h> #include <cr/GrowableArray.h> #include <cr/Optional.h> +#include <utility> #include <concepts> #include <algorithm> #include <ranges> diff --git a/src/critter-script-walk.cpp b/src/critter-script-walk.cpp index 2402fe74..c0e800e8 100644 --- a/src/critter-script-walk.cpp +++ b/src/critter-script-walk.cpp @@ -7,6 +7,7 @@ #include "search-result.hpp" #include "search-astar.hpp" #include "entity/name-of.hpp" +#include <utility> namespace floormat { diff --git a/src/point.hpp b/src/point.hpp index 8d40992b..f0e39aed 100644 --- a/src/point.hpp +++ b/src/point.hpp @@ -30,7 +30,7 @@ struct point constexpr chunk_coords_ chunk3() const; constexpr local_coords local() const; constexpr Vector2b offset() const; - template<size_t N> std::tuple_element_t<N, point> constexpr get() const; + template<size_t N> typename std::tuple_element<N, point>::type constexpr get() const; friend Debug& operator<<(Debug& dbg, const point& pt); @@ -59,7 +59,7 @@ constexpr chunk_coords point::chunk() const { return {cx, cy}; } constexpr local_coords point::local() const { return tile; } constexpr Vector2b point::offset() const { return _offset; } -template<size_t N> std::tuple_element_t<N, point> constexpr point::get() const +template<size_t N> typename std::tuple_element<N, point>::type constexpr point::get() const { static_assert(N < 2); if constexpr(N == 0) |