From d4176daf32db76f3ad0eac333e43911d2bd25eca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:13:30 +0000 Subject: [PATCH 1/4] Bump src/third_party/reflect-cpp from `d2bff99` to `b6651a4` Bumps [src/third_party/reflect-cpp](https://github.com/getml/reflect-cpp) from `d2bff99` to `b6651a4`. - [Release notes](https://github.com/getml/reflect-cpp/releases) - [Commits](https://github.com/getml/reflect-cpp/compare/d2bff9969a295109e780d97f1a847f29b80cd369...b6651a4062b717e5928959af53e201731668ae9d) --- updated-dependencies: - dependency-name: src/third_party/reflect-cpp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- src/third_party/reflect-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/third_party/reflect-cpp b/src/third_party/reflect-cpp index d2bff9969a..b6651a4062 160000 --- a/src/third_party/reflect-cpp +++ b/src/third_party/reflect-cpp @@ -1 +1 @@ -Subproject commit d2bff9969a295109e780d97f1a847f29b80cd369 +Subproject commit b6651a4062b717e5928959af53e201731668ae9d From d1ef86fde552e9b3f8565cced7df650e81900f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Walenciak?= Date: Sun, 25 Aug 2024 21:20:00 +0200 Subject: [PATCH 2/4] Update to version 0.14.1 --- src/third_party/reflect-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/third_party/reflect-cpp b/src/third_party/reflect-cpp index b6651a4062..b661b6147a 160000 --- a/src/third_party/reflect-cpp +++ b/src/third_party/reflect-cpp @@ -1 +1 @@ -Subproject commit b6651a4062b717e5928959af53e201731668ae9d +Subproject commit b661b6147a77415a58d6473e605de5f624106c27 From 65081b18cb35e27108a016d78165dc3b5323771b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Walenciak?= Date: Mon, 26 Aug 2024 09:08:34 +0200 Subject: [PATCH 3/4] Use system-like style for include --- src/core/unit_tests/json_serializer_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/unit_tests/json_serializer_tests.cpp b/src/core/unit_tests/json_serializer_tests.cpp index 6db090ffda..1a6866eac8 100644 --- a/src/core/unit_tests/json_serializer_tests.cpp +++ b/src/core/unit_tests/json_serializer_tests.cpp @@ -1,7 +1,7 @@ #include +#include -#include "rfl.hpp" #include "json_serializer.hpp" #include "json_serializer_tests.hpp" From 793ec617a315e6551f37531b2cf2ab55530b3bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Walenciak?= Date: Mon, 26 Aug 2024 09:10:51 +0200 Subject: [PATCH 4/4] Adopt to changes in reflect-cpp library --- src/core/json_serializer.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/json_serializer.hpp b/src/core/json_serializer.hpp index 056932f1e4..d197b72b93 100644 --- a/src/core/json_serializer.hpp +++ b/src/core/json_serializer.hpp @@ -93,11 +93,11 @@ namespace JSon const auto objView = rfl::to_view(obj); - const auto process = [&jsonObj](F... _field) { + const auto process = [&jsonObj](F... _field) { (( jsonObj[QString::fromStdString(typename F::Name().str())] = getSerialized(*_field.value()) ), ...); }; - std::apply(process, objView.fields()); + rfl::apply(process, objView.fields()); return jsonObj; } @@ -143,11 +143,11 @@ namespace JSon const QJsonObject jsonObj = convertTo(json); auto objView = rfl::to_view(r); - const auto process = [&jsonObj](F... _field) { + const auto process = [&jsonObj](F... _field) { (( *_field.value() = getDeserialized>(jsonObj[QString::fromStdString(typename F::Name().str())]) ), ...); }; - std::apply(process, objView.fields()); + rfl::apply(process, objView.fields()); } return r;