diff options
| -rw-r--r-- | serialize/magnum-vector.hpp | 4 | ||||
| -rw-r--r-- | src/wall-atlas.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/serialize/magnum-vector.hpp b/serialize/magnum-vector.hpp index b98cade5..141bfb04 100644 --- a/serialize/magnum-vector.hpp +++ b/serialize/magnum-vector.hpp @@ -16,7 +16,7 @@ template<typename T> struct adl_serializer<Magnum::Math::Vector4<T>> : adl_seria template<> struct adl_serializer<Magnum::Color3> : nlohmann::adl_serializer<Magnum::Math::Vector<3, float>> {}; template<> struct adl_serializer<Magnum::Color4> : nlohmann::adl_serializer<Magnum::Math::Vector<4, float>> {}; -template<> struct adl_serializer<Magnum::Color3ub> : nlohmann::adl_serializer<Magnum::Math::Vector<3, std::uint8_t>> {}; -template<> struct adl_serializer<Magnum::Color4ub> : nlohmann::adl_serializer<Magnum::Math::Vector<4, std::uint8_t>> {}; +template<> struct adl_serializer<Magnum::Color3ub> : nlohmann::adl_serializer<Magnum::Math::Vector<3, floormat::uint8_t>> {}; +template<> struct adl_serializer<Magnum::Color4ub> : nlohmann::adl_serializer<Magnum::Math::Vector<4, floormat::uint8_t>> {}; } // namespace nlohmann diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp index da00cfe1..1c0a920d 100644 --- a/src/wall-atlas.hpp +++ b/src/wall-atlas.hpp @@ -74,7 +74,7 @@ struct Info }; struct DirArrayIndex { - std::uint8_t val = (uint8_t)-1; + uint8_t val = (uint8_t)-1; operator bool() const { return val != (uint8_t)-1; } bool operator==(const DirArrayIndex&) const noexcept; |