From 860189e34fb24cc908c306489bf2d62e6c13f5a8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 13 Jan 2024 03:52:43 +0100
Subject: w

---
 loader/atlas.cpp   | 6 +++---
 loader/json.cpp    | 1 -
 loader/texture.cpp | 1 -
 loader/vobj.cpp    | 6 ------
 4 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'loader')

diff --git a/loader/atlas.cpp b/loader/atlas.cpp
index 6ad91c56..f61502fe 100644
--- a/loader/atlas.cpp
+++ b/loader/atlas.cpp
@@ -5,10 +5,10 @@
 #include "src/anim-atlas.hpp"
 #include <cstdio>
 #include <algorithm>
-#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/StridedArrayView.h>
-#include <Corrade/Containers/StringStlView.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/Utility/Path.h>
 #include <Magnum/Trade/ImageData.h>
 
@@ -51,7 +51,7 @@ ArrayView<const String> loader_impl::anim_atlas_list()
     if (anim_atlases.empty())
         get_anim_atlas_list();
     fm_assert(!anim_atlases.empty());
-    return anim_atlases;
+    return { anim_atlases.data(), anim_atlases.size() };
 }
 
 std::shared_ptr<anim_atlas> loader_impl::anim_atlas(StringView name, StringView dir) noexcept(false)
diff --git a/loader/json.cpp b/loader/json.cpp
index 31777aa2..7b12b784 100644
--- a/loader/json.cpp
+++ b/loader/json.cpp
@@ -7,7 +7,6 @@
 #include "serialize/scenery.hpp"
 #include "loader/scenery.hpp"
 #include <Corrade/Containers/ArrayViewStl.h>
-#include <Corrade/Containers/StringStlView.h>
 #include <Corrade/Utility/Path.h>
 
 namespace floormat::loader_detail {
diff --git a/loader/texture.cpp b/loader/texture.cpp
index a68a6337..8ac9e793 100644
--- a/loader/texture.cpp
+++ b/loader/texture.cpp
@@ -5,7 +5,6 @@
 #include "compat/strerror.hpp"
 #include <cstring>
 #include <cstdio>
-#include <Corrade/Containers/StringStlView.h>
 #include <Corrade/Utility/Path.h>
 #include <Magnum/Trade/ImageData.h>
 
diff --git a/loader/vobj.cpp b/loader/vobj.cpp
index 66aef1cd..db277410 100644
--- a/loader/vobj.cpp
+++ b/loader/vobj.cpp
@@ -18,12 +18,6 @@ struct vobj {
 
 using floormat::loader_detail::vobj;
 
-template<>
-struct nlohmann::adl_serializer<vobj> {
-    static void to_json(json& j, const vobj& val);
-    static void from_json(const json& j, vobj& val);
-};
-
 void nlohmann::adl_serializer<vobj>::to_json(json& j, const vobj& val)
 {
     j["name"] = val.name;
-- 
cgit v1.2.3