-#define xbt_assert(cond) if (!(cond)) THROW1(0,0,"Assertion %s failed", #cond)
- /** @hideinitializer */
-#define xbt_assert0(cond,msg) if (!(cond)) THROW0(0,0,msg)
- /** @hideinitializer */
-#define xbt_assert1(cond,msg,a) if (!(cond)) THROW1(0,0,msg,a)
- /** @hideinitializer */
-#define xbt_assert2(cond,msg,a,b) if (!(cond)) THROW2(0,0,msg,a,b)
- /** @hideinitializer */
-#define xbt_assert3(cond,msg,a,b,c) if (!(cond)) THROW3(0,0,msg,a,b,c)
- /** @hideinitializer */
-#define xbt_assert4(cond,msg,a,b,c,d) if (!(cond)) THROW4(0,0,msg,a,b,c,d)
- /** @hideinitializer */
-#define xbt_assert5(cond,msg,a,b,c,d,e) if (!(cond)) THROW5(0,0,msg,a,b,c,d,e)
- /** @hideinitializer */
-#define xbt_assert6(cond,msg,a,b,c,d,e,f) if (!(cond)) THROW6(0,0,msg,a,b,c,d,e,f)
+#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__)
+