diff options
Diffstat (limited to 'serialize/tile-atlas.cpp')
| -rw-r--r-- | serialize/tile-atlas.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/serialize/tile-atlas.cpp b/serialize/tile-atlas.cpp index 874a7054..711d5fdd 100644 --- a/serialize/tile-atlas.cpp +++ b/serialize/tile-atlas.cpp @@ -1,6 +1,7 @@ #include "src/tile-atlas.hpp" #include "serialize/tile-atlas.hpp" #include "serialize/magnum-vector2i.hpp" +#include "serialize/string.hpp" #include "loader.hpp" #include <tuple> @@ -10,7 +11,7 @@ using namespace floormat; namespace nlohmann { -using proxy_atlas = std::tuple<std::string, Vector2ub>; +using proxy_atlas = std::tuple<StringView, Vector2ub>; void adl_serializer<std::shared_ptr<tile_atlas>>::to_json(json& j, const std::shared_ptr<const tile_atlas>& x) { @@ -18,7 +19,7 @@ void adl_serializer<std::shared_ptr<tile_atlas>>::to_json(json& j, const std::sh if (!x) j = nullptr; else - to_json(j, proxy_atlas{x->name(), x->num_tiles2()}); + to_json(j, std::tuple<StringView, Vector2ub>{x->name(), x->num_tiles2()}); } void adl_serializer<std::shared_ptr<tile_atlas>>::from_json(const json& j, std::shared_ptr<tile_atlas>& x) |