- @hideinitializer */
-#define xbt_assert(cond) do { if (!(cond)) THROWF(0,0,"Assertion %s failed", #cond); } while (0)
- /** @hideinitializer */
-#define xbt_assert0(cond,msg) do { if (!(cond)) THROWF(0,0,msg); } while (0)
- /** @hideinitializer */
-#define xbt_assert1(cond,msg,a) do { if (!(cond)) THROWF(0,0,msg,a); } while (0)
- /** @hideinitializer */
-#define xbt_assert2(cond,msg,a,b) do { if (!(cond)) THROWF(0,0,msg,a,b); } while (0)
- /** @hideinitializer */
-#define xbt_assert3(cond,msg,a,b,c) do { if (!(cond)) THROWF(0,0,msg,a,b,c); } while (0)
- /** @hideinitializer */
-#define xbt_assert4(cond,msg,a,b,c,d) do { if (!(cond)) THROWF(0,0,msg,a,b,c,d); } while (0)
- /** @hideinitializer */
-#define xbt_assert5(cond,msg,a,b,c,d,e) do { if (!(cond)) THROWF(0,0,msg,a,b,c,d,e); } while (0)
- /** @hideinitializer */
-#define xbt_assert6(cond,msg,a,b,c,d,e,f) do { if (!(cond)) THROWF(0,0,msg,a,b,c,d,e,f); } while (0)
+ @hideinitializer */
+#define xbt_assert(...) \
+ _XBT_IF_ONE_ARG(_xbt_assert_ARG1, _xbt_assert_ARGN, __VA_ARGS__)(__VA_ARGS__)
+#define _xbt_assert_ARG1(cond) \
+ _xbt_assert_ARGN(cond, "Assertion %s failed", #cond)
+#define _xbt_assert_ARGN(cond, ...) \
+ do { if (!(cond)) THROWF(0, 0, __VA_ARGS__); } while (0)
+#endif
+
+#ifdef XBT_USE_DEPRECATED
+
+#define xbt_assert0(...) xbt_assert(__VA_ARGS__)
+#define xbt_assert1(...) xbt_assert(__VA_ARGS__)
+#define xbt_assert2(...) xbt_assert(__VA_ARGS__)
+#define xbt_assert3(...) xbt_assert(__VA_ARGS__)
+#define xbt_assert4(...) xbt_assert(__VA_ARGS__)
+#define xbt_assert5(...) xbt_assert(__VA_ARGS__)
+#define xbt_assert6(...) xbt_assert(__VA_ARGS__)
+