diff options
Diffstat (limited to 'serialize')
-rw-r--r-- | serialize/corrade-string.cpp | 2 | ||||
-rw-r--r-- | serialize/json-helper.cpp | 2 | ||||
-rw-r--r-- | serialize/packbits.hpp | 2 | ||||
-rw-r--r-- | serialize/pass-mode.cpp | 2 | ||||
-rw-r--r-- | serialize/scenery.cpp | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/serialize/corrade-string.cpp b/serialize/corrade-string.cpp index 7b772d4c..9820e37a 100644 --- a/serialize/corrade-string.cpp +++ b/serialize/corrade-string.cpp @@ -1,6 +1,6 @@ #include "corrade-string.hpp" +#include <Corrade/Containers/StringStlView.h> #include <nlohmann/json.hpp> -#include <string_view> using namespace floormat; diff --git a/serialize/json-helper.cpp b/serialize/json-helper.cpp index b9853794..315dec2d 100644 --- a/serialize/json-helper.cpp +++ b/serialize/json-helper.cpp @@ -3,7 +3,7 @@ #include "compat/strerror.hpp" #include <concepts> #include <fstream> -#include <Corrade/Containers/StringStlView.h> +#include <Corrade/Containers/StringView.h> namespace floormat { diff --git a/serialize/packbits.hpp b/serialize/packbits.hpp index 41e15177..954f86b5 100644 --- a/serialize/packbits.hpp +++ b/serialize/packbits.hpp @@ -94,6 +94,4 @@ struct Bits_ final static constexpr auto bits = N; }; - - } // namespace floormat::Pack diff --git a/serialize/pass-mode.cpp b/serialize/pass-mode.cpp index e06bf99d..c784855a 100644 --- a/serialize/pass-mode.cpp +++ b/serialize/pass-mode.cpp @@ -2,7 +2,7 @@ #include "compat/exception.hpp" #include "serialize/corrade-string.hpp" #include <nlohmann/json.hpp> -#include <Corrade/Containers/StringStlView.h> +#include <Corrade/Containers/String.h> namespace nlohmann { diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp index c3e6bda8..41b99218 100644 --- a/serialize/scenery.cpp +++ b/serialize/scenery.cpp @@ -7,7 +7,7 @@ #include "loader/scenery.hpp" #include "serialize/pass-mode.hpp" #include "serialize/magnum-vector.hpp" -#include <Corrade/Containers/StringStlView.h> +#include <Corrade/Containers/String.h> #include <nlohmann/json.hpp> namespace { |