Fix compilation issue seen in MSBuild 17.10.4 (#217)

realm · Jun 12, 2024 · 70ccfd7 · 70ccfd7
1 parent 14a4992
commit 70ccfd7
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 228 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+X.Y.Z Release notes (YYYY-MM-DD)
+=============================================================
+
+### Fixed
+* Fixed a compilation issue seen in MSBuild 17.10.4 due to usage of `std::apply`.
+
+### Enhancements
+* None
+
+### Compatibility
+* Fileformat: Generates files with format v24. Reads and automatically upgrade from fileformat v10.
+
+### Internals
+* None
+
+----------------------------------------------
+
 2.0.1 Release notes (2024-06-03)
 =============================================================
 

diff --git a/include/cpprealm/db.hpp b/include/cpprealm/db.hpp
@@ -106,13 +106,7 @@ namespace realm {
                         m_obj, m_obj.get_table().get_column_key(p.name), m_realm, v.*(std::decay_t<decltype(p)>::ptr)
                 ), ...);
             }, managed<T>::schema.ps);
-            auto m = managed<T>(std::move(m_obj), m_realm);
-            std::apply([&m](auto && ...ptr) {
-                std::apply([&](auto&& ...name) {
-                    ((m.*ptr).assign(&m.m_obj, &m.m_realm, m.m_obj.get_table().get_column_key(name)), ...);
-                }, managed<T>::managed_pointers_names);
-            }, managed<T>::managed_pointers());
-            return m;
+            return managed<T>(std::move(m_obj), m_realm);
         }
         template <typename T>
         void remove(T& object)
@@ -178,13 +172,7 @@ namespace realm {
         {
             auto object = internal::bridge::resolve<internal::bridge::object>(m_realm, std::move(tsr.m_tsr));
             internal::bridge::obj m_obj = object.get_obj();
-            auto m = managed<T>(std::move(m_obj), m_realm);
-            std::apply([&m](auto && ...ptr) {
-                std::apply([&](auto&& ...name) {
-                    ((m.*ptr).assign(&m.m_obj, &m.m_realm, m.m_obj.get_table().get_column_key(name)), ...);
-                }, managed<T>::managed_pointers_names);
-            }, managed<T>::managed_pointers());
-            return m;
+            return managed<T>(std::move(m_obj), m_realm);
         }
 
         bool is_frozen() const;

diff --git a/include/cpprealm/internal/bridge/utils.hpp b/include/cpprealm/internal/bridge/utils.hpp
@@ -49,4 +49,17 @@ namespace realm::internal::bridge {
     };
 }
 
+namespace realm::internal {
+    template <typename... Ts, typename... Us, size_t... Is>
+    auto constexpr zip_tuples_impl(const std::tuple<Ts...>& tuple1, const std::tuple<Us...>& tuple2, std::index_sequence<Is...>) {
+        return std::make_tuple(std::make_pair(std::get<Is>(tuple1), std::get<Is>(tuple2))...);
+    }
+
+    template <typename... Ts, typename... Us>
+    auto constexpr zip_tuples(const std::tuple<Ts...>& tuple1, const std::tuple<Us...>& tuple2) {
+        static_assert(sizeof...(Ts) == sizeof...(Us), "Tuples must have the same size");
+        return zip_tuples_impl(tuple1, tuple2, std::index_sequence_for<Ts...>());
+    }
+}
+
 #endif //CPPREALM_BRIDGE_UTILS_HPP
diff --git a/include/cpprealm/link.hpp b/include/cpprealm/link.hpp
@@ -37,7 +37,7 @@ namespace realm {
             auto assign = [&m, &v](auto& pair) {
                 (*v).*(std::decay_t<decltype(pair.first)>::ptr) = (m.*(pair.second)).detach();
             };
-            auto zipped = zipTuples(managed<T>::schema.ps, managed<T>::managed_pointers());
+            auto zipped = internal::zip_tuples(managed<T>::schema.ps, managed<T>::managed_pointers());
             std::apply([&v, &m, &assign](auto && ...pair) {
                 (assign(pair), ...);
             }, zipped);
@@ -139,12 +139,6 @@ namespace realm {
                          obj, obj.get_table().get_column_key(p.name), realm, (*o).*(std::decay_t<decltype(p)>::ptr)
                                  ), ...);
             }, managed<T>::schema.ps);
-            auto m = managed<T>(std::move(obj), *m_realm);
-            std::apply([&m](auto && ...ptr) {
-                std::apply([&](auto&& ...name) {
-                    ((m.*ptr).assign(&m.m_obj, &m.m_realm, m.m_obj.get_table().get_column_key(name)), ...);
-                }, managed<T>::managed_pointers_names);
-            }, managed<T>::managed_pointers());
             return *this;
         }
 

diff --git a/include/cpprealm/macros.hpp b/include/cpprealm/macros.hpp
diff --git a/include/cpprealm/managed_dictionary.hpp b/include/cpprealm/managed_dictionary.hpp
@@ -357,7 +357,7 @@ namespace realm {
                     auto assign = [&m, &v](auto& pair) {
                         (*v).*(std::decay_t<decltype(pair.first)>::ptr) = (m.*(pair.second)).detach();
                     };
-                    auto zipped = zipTuples(managed<Type>::schema.ps, managed<Type>::managed_pointers());
+                    auto zipped = internal::zip_tuples(managed<Type>::schema.ps, managed<Type>::managed_pointers());
 
                     std::apply([&v, &m, &assign](auto && ...pair) {
                         (assign(pair), ...);

diff --git a/include/cpprealm/managed_list.hpp b/include/cpprealm/managed_list.hpp
@@ -189,7 +189,7 @@ namespace realm {
                 auto assign = [&m, &v](auto& pair) {
                     (*v).*(std::decay_t<decltype(pair.first)>::ptr) = (m.*(pair.second)).detach();
                 };
-                auto zipped = zipTuples(managed<T>::schema.ps, managed<T>::managed_pointers());
+                auto zipped = internal::zip_tuples(managed<T>::schema.ps, managed<T>::managed_pointers());
                 std::apply([&v, &m, &assign](auto && ...pair) {
                     (assign(pair), ...);
                 }, zipped);
@@ -226,11 +226,6 @@ namespace realm {
             {
                 auto list = realm::internal::bridge::list(*m_parent->m_realm, *m_parent->m_obj, m_parent->m_key);
                 managed<T> m(realm::internal::bridge::get<realm::internal::bridge::obj>(list, m_i), *m_parent->m_realm);
-                std::apply([&m](auto &&...ptr) {
-                    std::apply([&](auto &&...name) {
-                        ((m.*ptr).assign(&m.m_obj, &m.m_realm, m.m_obj.get_table().get_column_key(name)), ...);
-                    }, managed<T>::managed_pointers_names);
-                }, managed<T>::managed_pointers());
                 return {std::move(m)};
             }
 

diff --git a/include/cpprealm/managed_set.hpp b/include/cpprealm/managed_set.hpp
@@ -235,7 +235,7 @@ namespace realm {
                 auto assign = [&m, &v](auto& pair) {
                     (*v).*(std::decay_t<decltype(pair.first)>::ptr) = (m.*(pair.second)).detach();
                 };
-                auto zipped = zipTuples(managed<T>::schema.ps, managed<T>::managed_pointers());
+                auto zipped = internal::zip_tuples(managed<T>::schema.ps, managed<T>::managed_pointers());
                 std::apply([&v, &m, &assign](auto && ...pair) {
                     (assign(pair), ...);
                 }, zipped);