Update yatl.

[awesomized/libmemcached] / libmemcached / assert.hpp

diff --git a/libmemcached/assert.hpp b/libmemcached/assert.hpp
index acd0198e3df52848cefa876a36068ea822f0a730..f2fc158d88a761172044b9c1a3e0d19e6e64e6e4 100644 (file)
--- a/libmemcached/assert.hpp
+++ b/libmemcached/assert.hpp
@@ -37,11 +37,17 @@
 
 #pragma once
 
-#include <cstdlib>
-#include <cstdio>
+#ifdef _WIN32
+# include <malloc.h>
+#else
+# include <alloca.h>
+#endif
+
+#include <cstdarg>
 
 #ifdef NDEBUG
-#define        assert(__expr, __mesg)  ((void)0)
+#define assert_msg(__expr, __mesg) (void)(__expr); (void)(__mesg);
+#define assert_vmsg(__expr, __mesg, ...) (void)(__expr); (void)(__mesg);
 #else
 
 #define assert_msg(__expr, __mesg) \
@@ -49,7 +55,22 @@ do \
 { \
   if (not (__expr)) \
   { \
-    fprintf(stderr, "\nAssertion \"%s\" failed for function \"%s\" likely for %s, at %s:%d\n", #__expr, __func__, (#__mesg),  __FILE__, __LINE__);\
+    fprintf(stderr, "\n%s:%d Assertion \"%s\" failed for function \"%s\" likely for %s\n", __FILE__, __LINE__, #__expr, __func__, (#__mesg));\
+    custom_backtrace(); \
+    abort(); \
+  } \
+} while (0)
+
+#define assert_vmsg(__expr, __mesg, ...) \
+do \
+{ \
+  if (not (__expr)) \
+  { \
+    size_t ask= snprintf(0, 0, (__mesg), __VA_ARGS__); \
+    ask++; \
+    char *_error_message= (char*)alloca(sizeof(char) * ask); \
+    size_t _error_message_size= snprintf(_error_message, ask, (__mesg), __VA_ARGS__); \
+    fprintf(stderr, "\n%s:%d Assertion '%s' failed for function '%s' [ %.*s ]\n", __FILE__, __LINE__, #__expr, __func__, int(_error_message_size), _error_message);\
     custom_backtrace(); \
     abort(); \
   } \