Merge pull request #663 from Kicer86/dependabot/submodules/src/third_…

…party/reflect-cpp-b6651a4 Bump src/third_party/reflect-cpp from `d2bff99` to `b6651a4`
Kicer86 · Aug 26, 2024 · af30b63 · af30b63
2 parents c874e76 + 793ec61
commit af30b63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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]<class... F>(F... _field) {
+                const auto process = [&jsonObj]<typename... F>(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<QJsonObject>(json);
                 auto objView = rfl::to_view(r);
 
-                const auto process = [&jsonObj]<class... F>(F... _field) {
+                const auto process = [&jsonObj]<typename... F>(F... _field) {
                     (( *_field.value() = getDeserialized<std::remove_pointer_t<typename F::Type>>(jsonObj[QString::fromStdString(typename F::Name().str())]) ), ...);
                 };
 
-                std::apply(process, objView.fields());
+                rfl::apply(process, objView.fields());
             }
 
             return r;

diff --git a/src/core/unit_tests/json_serializer_tests.cpp b/src/core/unit_tests/json_serializer_tests.cpp
@@ -1,7 +1,7 @@
 
 #include <gtest/gtest.h>
+#include <rfl.hpp>
 
-#include "rfl.hpp"
 #include "json_serializer.hpp"
 #include "json_serializer_tests.hpp"
 

diff --git a/src/third_party/reflect-cpp b/src/third_party/reflect-cpp