diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-05 19:29:40 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-05 19:29:40 +0100 |
commit | 12eca108a07cde1606fca3e472aed58749407699 (patch) | |
tree | 44ac90dffca8cde0fc06800c5546cd12f5cd9249 /serialize/magnum-vector2i.hpp | |
parent | 28f5a46ba0058752d4e92cc66e0260f4ed2b8cf3 (diff) |
replace std::string with Corrade's String
Diffstat (limited to 'serialize/magnum-vector2i.hpp')
-rw-r--r-- | serialize/magnum-vector2i.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serialize/magnum-vector2i.hpp b/serialize/magnum-vector2i.hpp index 02e1fdd1..0b440c78 100644 --- a/serialize/magnum-vector2i.hpp +++ b/serialize/magnum-vector2i.hpp @@ -1,6 +1,6 @@ #include "compat/assert.hpp" +#include "serialize/string.hpp" #include <cstdio> -#include <string> #include <Magnum/Math/Vector2.h> #include <nlohmann/json.hpp> @@ -20,12 +20,12 @@ struct adl_serializer<Magnum::Math::Vector2<t>> final } static void from_json(const json& j, Magnum::Math::Vector2<t>& val) { - std::string str = j; + Corrade::Containers::StringView str = j; using type = std::conditional_t<std::is_signed_v<t>, std::intmax_t, std::uintmax_t>; constexpr auto format_string = std::is_signed_v<t> ? "%jd x %jd%n" : "%ju x %ju%n"; type x = 0, y = 0; int n = 0; - int ret = std::sscanf(str.c_str(), format_string, &x, &y, &n); + int ret = std::sscanf(str.data(), format_string, &x, &y, &n); if (ret != 2 || (std::size_t)n != str.size() || x != (t)x || y != (t)y) fm_abort("failed to parse Vector2"); val = { (t)x, (t)y }; |