From 8b6b947f9c8d8062d8e265514aa524341914f6be Mon Sep 17 00:00:00 2001
From: saipubw <Zezheng.Li@linux.alibaba.com>
Date: Thu, 19 Sep 2024 17:16:21 +0800
Subject: [PATCH] [struct_pack][fix] fix compile error for user-defined
 serialization with user-defined stream input/output (#776)

---
 include/ylt/struct_pack/user_helper.hpp       |  6 ++-
 .../examples/user_defined_serialization.cpp   | 43 +++++++++++++++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/include/ylt/struct_pack/user_helper.hpp b/include/ylt/struct_pack/user_helper.hpp
index 35a0a1f3f..1c2c6336e 100644
--- a/include/ylt/struct_pack/user_helper.hpp
+++ b/include/ylt/struct_pack/user_helper.hpp
@@ -2,6 +2,7 @@
 #include <cstdint>
 
 #include "ylt/struct_pack/calculate_size.hpp"
+#include "ylt/struct_pack/endian_wrapper.hpp"
 #include "ylt/struct_pack/packer.hpp"
 #include "ylt/struct_pack/reflection.hpp"
 #include "ylt/struct_pack/unpacker.hpp"
@@ -17,7 +18,7 @@ template <std::size_t size_width = sizeof(uint64_t), typename Writer,
 STRUCT_PACK_INLINE void write(Writer& writer, const T* t, std::size_t len) {
   if constexpr (detail::is_trivial_serializable<T>::value &&
                 detail::is_little_endian_copyable<sizeof(T)>) {
-    write_bytes_array(writer, (char*)t, sizeof(T) * len);
+    detail::write_bytes_array(writer, (char*)t, sizeof(T) * len);
   }
   else {
     struct_pack::detail::packer<Writer, T, true> packer{writer};
@@ -40,7 +41,8 @@ STRUCT_PACK_INLINE struct_pack::err_code read(Reader& reader, T* t,
   if constexpr (detail::is_trivial_serializable<T>::value &&
                 detail::is_little_endian_copyable<sizeof(T)>) {
     if constexpr (!ifSkip) {
-      if SP_UNLIKELY (!read_bytes_array(reader, (char*)t, sizeof(T) * len)) {
+      if SP_UNLIKELY (!detail::read_bytes_array(reader, (char*)t,
+                                                sizeof(T) * len)) {
         return struct_pack::errc::no_buffer_space;
       }
     }
diff --git a/src/struct_pack/examples/user_defined_serialization.cpp b/src/struct_pack/examples/user_defined_serialization.cpp
index 1f0701ac3..fc7009b57 100644
--- a/src/struct_pack/examples/user_defined_serialization.cpp
+++ b/src/struct_pack/examples/user_defined_serialization.cpp
@@ -96,14 +96,49 @@ struct_pack::err_code sp_deserialize_to(Reader& reader, array2D& ar) {
 // struct_pack::errc sp_deserialize_to_with_skip(Reader& reader, array2D& ar);
 }  // namespace my_name_space
 
+struct fwrite_stream {
+  FILE* file;
+  bool write(const char* data, std::size_t sz) {
+    return fwrite(data, sz, 1, file) == 1;
+  }
+  fwrite_stream(const char* file_name) : file(fopen(file_name, "wb")) {}
+  ~fwrite_stream() { fclose(file); }
+};
+
+struct fread_stream {
+  FILE* file;
+  bool read(char* data, std::size_t sz) {
+    return fread(data, sz, 1, file) == 1;
+  }
+  bool ignore(std::size_t sz) { return fseek(file, sz, SEEK_CUR) == 0; }
+  std::size_t tellg() {
+    // if you worry about ftell performance, just use an variable to record it.
+    return ftell(file);
+  }
+  fread_stream(const char* file_name) : file(fopen(file_name, "rb")) {}
+  ~fread_stream() { fclose(file); }
+};
+
 void user_defined_serialization() {
   std::vector<my_name_space::array2D> ar;
   ar.emplace_back(11, 22);
   ar.emplace_back(114, 514);
   ar[0](1, 6) = 3.14;
   ar[1](87, 111) = 2.71;
-  auto buffer = struct_pack::serialize(ar);
-  auto result = struct_pack::deserialize<decltype(ar)>(buffer);
-  assert(result.has_value());
-  assert(ar == result);
+  {
+    auto buffer = struct_pack::serialize(ar);
+    auto result = struct_pack::deserialize<decltype(ar)>(buffer);
+    assert(result.has_value());
+    assert(ar == result);
+  }
+  {
+    {
+      fwrite_stream out("1.tmp");
+      struct_pack::serialize_to(out, ar);
+    }
+    fread_stream in("1.tmp");
+    auto result = struct_pack::deserialize<decltype(ar)>(in);
+    assert(result.has_value());
+    assert(ar == result);
+  }
 }
\ No newline at end of file