fix

qicosmos · Oct 15, 2024 · d600f5e · d600f5e
1 parent 095f27c
commit d600f5e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/iguana/common.hpp b/iguana/common.hpp
@@ -215,8 +215,8 @@ template <typename T>
 inline auto get_pb_members_tuple(T&& t) {
   using U = ylt::reflection::remove_cvref_t<T>;
   if constexpr (ylt_refletable_v<U>) {
-    static auto& offset_arr = ylt::reflection::internal::get_member_offset_arr(
-        ylt::reflection::internal::wrapper<U>::value);
+    static auto& offset_arr =
+        ylt::reflection::internal::get_member_offset_arr(std::forward<T>(t));
     using Tuple = decltype(ylt::reflection::object_to_tuple(std::declval<U>()));
     return build_pb_fields<Tuple, T>(
         offset_arr, std::make_index_sequence<std::tuple_size_v<Tuple>>{});

diff --git a/test/test_pb.cpp b/test/test_pb.cpp
@@ -765,6 +765,26 @@ TEST_CASE("test members") {
       val);
 }
 
+struct some_obj_t {
+  std::string *name_;
+  int id_;
+
+  const std::string &name() const { return *name_; }
+};
+YLT_REFL(some_obj_t, name(), id_);
+
+TEST_CASE("mixed method and field") {
+  std::shared_ptr<std::string> ptr(new std::string("test"));
+  some_obj_t obj{ptr.get(), 42};
+  std::string str;
+  iguana::to_pb(obj, str);
+  CHECK(!str.empty());
+
+  some_obj_t obj1;
+  iguana::from_pb(obj1, str);
+  CHECK(obj.id_ == obj1.id_);
+}
+
 struct test_variant {
   test_variant() = default;
   test_variant(int a, std::variant<double, std::string, int> b, double c)