summaryrefslogtreecommitdiffhomepage
path: root/serialize/magnum-vector.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-07 10:10:01 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-07 10:10:01 +0200
commit7740c71ecedd90f9b465dc35994e64915dbda826 (patch)
tree787b64948b03e64bbb6a655297889e757012354a /serialize/magnum-vector.hpp
parent853049b279fa5adb3522bba671188247a1bc7141 (diff)
a
Diffstat (limited to 'serialize/magnum-vector.hpp')
-rw-r--r--serialize/magnum-vector.hpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/serialize/magnum-vector.hpp b/serialize/magnum-vector.hpp
index 8ea5e13a..61e127b1 100644
--- a/serialize/magnum-vector.hpp
+++ b/serialize/magnum-vector.hpp
@@ -22,13 +22,16 @@ void adl_serializer<Magnum::Math::Vector<N, T>>::to_json(json& j, const vec& val
std::array<T, N> array{};
for (std::size_t i = 0; i < N; i++)
array[i] = val[i];
- j = array;
+ using nlohmann::to_json;
+ to_json(j, array);
}
template <std::size_t N, typename T>
void adl_serializer<Magnum::Math::Vector<N, T>>::from_json(const json& j, vec& val)
{
- std::array<T, N> array = j;
+ std::array<T, N> array{};
+ using nlohmann::from_json;
+ from_json(j, array);
for (std::size_t i = 0; i < N; i++)
val[i] = array[i];
}