merge conflict

xiao.dong · xiao.dong · commit d0556dfa53a7 · 2025-10-09T15:00:58.000+08:00
diff --git a/src/iceberg/util/macros.h b/src/iceberg/util/macros.h
@@ -38,3 +38,5 @@
 #define ICEBERG_ASSIGN_OR_RAISE(lhs, rexpr)                                             \
   ICEBERG_ASSIGN_OR_RAISE_IMPL(ICEBERG_ASSIGN_OR_RAISE_NAME(result_, __COUNTER__), lhs, \
                                rexpr)
+
+#define ICEBERG_DCHECK(expr, message) assert((expr) && (message))
