X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fassert.hpp;h=cd4a194b2b1ce305e074e5f090ca82abead4d2ee;hb=7db3b0483da2a158f2559cd55f13ef7769e36d10;hp=f2fc158d88a761172044b9c1a3e0d19e6e64e6e4;hpb=ff3501d8602ddcf33b99d203f4ceb017ac411ce6;p=awesomized%2Flibmemcached

diff --git a/libmemcached/assert.hpp b/libmemcached/assert.hpp
index f2fc158d..cd4a194b 100644
--- a/libmemcached/assert.hpp
+++ b/libmemcached/assert.hpp
@@ -2,7 +2,7 @@
  * 
  *  libmcachedd client library.
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -37,20 +37,34 @@
 
 #pragma once
 
-#ifdef _WIN32
-# include <malloc.h>
+#ifdef __cplusplus
+# include <cassert>
 #else
-# include <alloca.h>
-#endif
-
-#include <cstdarg>
+# include <assert.h>
+#endif // __cplusplus
 
 #ifdef NDEBUG
-#define assert_msg(__expr, __mesg) (void)(__expr); (void)(__mesg);
-#define assert_vmsg(__expr, __mesg, ...) (void)(__expr); (void)(__mesg);
+# define assert_msg(__expr, __mesg) (void)(__expr); (void)(__mesg);
+# define assert_vmsg(__expr, __mesg, ...) (void)(__expr); (void)(__mesg);
+#else
+
+# ifdef _WIN32
+#  include <malloc.h>
+# else
+#  include <alloca.h>
+# endif
+
+#ifdef __cplusplus
+# include <cstdarg>
+# include <cstdio>
 #else
+# include <stdarg.h>
+# include <stdio.h>
+#endif
 
-#define assert_msg(__expr, __mesg) \
+# include <libmemcached/backtrace.hpp>
+
+# define assert_msg(__expr, __mesg) \
 do \
 { \
   if (not (__expr)) \
@@ -61,7 +75,7 @@ do \
   } \
 } while (0)
 
-#define assert_vmsg(__expr, __mesg, ...) \
+# define assert_vmsg(__expr, __mesg, ...) \
 do \
 { \
   if (not (__expr)) \
@@ -76,4 +90,4 @@ do \
   } \
 } while (0)
 
-#endif
+#endif // NDEBUG