diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2025-02-05 05:17:47 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2025-02-05 06:22:43 +0100 |
| commit | ab13ab5f71a5b09de3b9526feca2ed7c564cee7e (patch) | |
| tree | 1699d8de2dd8217b7133b19c1a9878494a2854ca /entity/erased-constraints.cpp | |
| parent | 867a22c2a989b3f3a2bc47044226f5f9df6a59fd (diff) | |
switch to Corrade pair impl from stl
Diffstat (limited to 'entity/erased-constraints.cpp')
| -rw-r--r-- | entity/erased-constraints.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/entity/erased-constraints.cpp b/entity/erased-constraints.cpp index 6e81820a..4cb915dc 100644 --- a/entity/erased-constraints.cpp +++ b/entity/erased-constraints.cpp @@ -2,17 +2,17 @@ #include "compat/assert.hpp" #include <cmath> #include <limits> -#include <Magnum/Magnum.h> -#include <Magnum/Math/Vector2.h> -#include <Magnum/Math/Vector3.h> -#include <Magnum/Math/Vector4.h> +#include <cr/Pair.h> +#include <mg/Vector2.h> +#include <mg/Vector3.h> +#include <mg/Vector4.h> namespace floormat::entities::erased_constraints { static_assert(sizeof(size_t) == sizeof(uintptr_t)); static_assert(sizeof(size_t) == sizeof(ptrdiff_t)); -template<typename T> std::pair<T, T> range::convert() const +template<typename T> Pair<T, T> range::convert() const { static_assert(sizeof(T) <= sizeof(min)); @@ -103,7 +103,7 @@ template<typename T> std::pair<T, T> range::convert() const } } -template<typename T> using pair2 = std::pair<T, T>; +template<typename T> using pair2 = Pair<T, T>; template pair2<uint8_t> range::convert() const; template pair2<uint16_t> range::convert() const; |
