Merge branch 'main' into add_user_data

alibaba · Jan 16, 2025 · b4b7a8e · b4b7a8e
2 parents 71dbece + d027389
commit b4b7a8e
Show file tree

Hide file tree

Showing 33 changed files with 871 additions and 2,282 deletions.
diff --git a/include/ylt/coro_rpc/impl/errno.h b/include/ylt/coro_rpc/impl/errno.h
@@ -115,6 +115,6 @@ struct rpc_error {
   const uint16_t& val() const { return *(uint16_t*)&(code.ec); }
   constexpr operator bool() const noexcept { return code; }
 };
-STRUCT_PACK_REFL(rpc_error, val(), msg);
+YLT_REFL(rpc_error, val(), msg);
 
 };  // namespace coro_rpc
diff --git a/include/ylt/reflection/internal/arg_list_macro.hpp b/include/ylt/reflection/internal/arg_list_macro.hpp
@@ -1,11 +1,13 @@
 #pragma once
 #include "common_macro.hpp"
 
+#define YLT_MACRO_EXPAND(...) __VA_ARGS__
+
 #define WRAP_ARGS0(w, o)
 #define WRAP_ARGS1(w, o, _1) w(o, _1)
 #include "generate/arg_list_macro_gen.hpp"
 
 #define WRAP_ARGS_(w, object, ...)                  \
   YLT_CONCAT(WRAP_ARGS, YLT_ARG_COUNT(__VA_ARGS__)) \
   (w, object, ##__VA_ARGS__)
-#define WRAP_ARGS(w, object, ...) WRAP_ARGS_(w, object, ##__VA_ARGS__)
+#define WRAP_ARGS(w, object, ...) WRAP_ARGS_(w, object, ##__VA_ARGS__)
diff --git a/include/ylt/reflection/internal/args_count.hpp b/include/ylt/reflection/internal/args_count.hpp
diff --git a/include/ylt/reflection/internal/common_macro.hpp b/include/ylt/reflection/internal/common_macro.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "args_count.hpp"
 #define YLT_CONCAT_(l, r) l##r
 
 #define YLT_CONCAT(l, r) YLT_CONCAT_(l, r)