diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-12-08 23:12:51 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-12-09 00:06:05 +0100 |
| commit | 2ec5c1eff1ba2ec8cc11c3e6cc01e623184a5c80 (patch) | |
| tree | fa819f23c91b469730470161240932cae0a64f3a | |
| parent | e46033b74ad4f747bbdefe8620f75eb530923b24 (diff) | |
update structured bindings for corrade/next
| -rw-r--r-- | shaders/lightmap.cpp | 3 | ||||
| -rw-r--r-- | src/chunk-collision.cpp | 3 | ||||
| -rw-r--r-- | src/object.cpp | 3 | ||||
| -rw-r--r-- | src/rotation.inl | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/shaders/lightmap.cpp b/shaders/lightmap.cpp index 30c98055..c56fbaa6 100644 --- a/shaders/lightmap.cpp +++ b/shaders/lightmap.cpp @@ -8,7 +8,8 @@ #include "src/object.hpp" #include "loader/loader.hpp" #include <utility> -#include <Corrade/Containers/PairStl.h> +#include <Corrade/Containers/StructuredBindings.h> +#include <Corrade/Containers/Pair.h> #include <Corrade/Containers/Iterable.h> #include <Corrade/Containers/ArrayViewStl.h> #include <Magnum/Math/Functions.h> diff --git a/src/chunk-collision.cpp b/src/chunk-collision.cpp index cae429c8..8b27fd83 100644 --- a/src/chunk-collision.cpp +++ b/src/chunk-collision.cpp @@ -5,7 +5,8 @@ #include "src/chunk-scenery.hpp" #include "src/tile-bbox.hpp" #include <bit> -#include <Corrade/Containers/PairStl.h> +#include <Corrade/Containers/StructuredBindings.h> +#include <Corrade/Containers/Pair.h> namespace floormat { diff --git a/src/object.cpp b/src/object.cpp index 02051fbf..71ce905c 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -7,7 +7,8 @@ #include "shaders/shader.hpp" #include <cmath> #include <algorithm> -#include <Corrade/Containers/PairStl.h> +#include <Corrade/Containers/StructuredBindings.h> +#include <Corrade/Containers/Pair.h> #include <Magnum/Math/Functions.h> namespace floormat { diff --git a/src/rotation.inl b/src/rotation.inl index b4d2d22b..c1ff84bc 100644 --- a/src/rotation.inl +++ b/src/rotation.inl @@ -1,8 +1,9 @@ #pragma once #include "compat/assert.hpp" #include "rotation.hpp" -#include <Corrade/Containers/PairStl.h> -#include <Corrade/Containers/TripleStl.h> +#include <Corrade/Containers/StructuredBindings.h> +#include <Corrade/Containers/Pair.h> +#include <Corrade/Containers/Triple.h> #include <Magnum/Magnum.h> #include <Magnum/Math/Vector2.h> |