X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fassert.hpp;h=28948c3c0cbfbb23f29fe5c51cbce2ddaff36275;hb=5d44e2b91e7055316b538128ec37c0fa81bbc28d;hp=acd0198e3df52848cefa876a36068ea822f0a730;hpb=0a45c8bafd621482cb08f2e5f792f42cafb13865;p=awesomized%2Flibmemcached

diff --git a/libmemcached/assert.hpp b/libmemcached/assert.hpp
index acd0198e..28948c3c 100644
--- a/libmemcached/assert.hpp
+++ b/libmemcached/assert.hpp
@@ -37,11 +37,8 @@
 
 #pragma once
 
-#include <cstdlib>
-#include <cstdio>
-
 #ifdef NDEBUG
-#define	assert(__expr, __mesg)	((void)0)
+#define assert_msg(__expr, __mesg) (void)(__expr); (void)(__mesg);
 #else
 
 #define assert_msg(__expr, __mesg) \
@@ -49,7 +46,7 @@ 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(); \
   } \