From: Brian Aker <brian@tangent.org>
Date: Tue, 14 Feb 2012 17:00:57 +0000 (-0800)
Subject: Intel compiler fix.
X-Git-Tag: 1.0.5~44
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=69e4ae10dc2c3d30f74db2c7f18dee16a7cedaef;p=m6w6%2Flibmemcached

Intel compiler fix.
---

diff --git a/libmemcached/memory.h b/libmemcached/memory.h
index e59eabbe..3d5faf8a 100644
--- a/libmemcached/memory.h
+++ b/libmemcached/memory.h
@@ -38,6 +38,15 @@
 
 #include <libmemcached-1.0/struct/memcached.h>
 
+#ifdef __cplusplus
+#include <cstddef>
+#include <cstdlib>
+#include <memory>
+#else
+#include <stddef.h>
+#include <stdlib.h>
+#endif
+
 static inline void libmemcached_free(const memcached_st *self, void *mem)
 {
   if (self)
@@ -46,7 +55,11 @@ static inline void libmemcached_free(const memcached_st *self, void *mem)
   }
   else if (mem)
   {
+#ifdef __cplusplus
+    std::free(mem);
+#else
     free(mem);
+#endif
   }
 }
 
@@ -57,7 +70,11 @@ static inline void *libmemcached_malloc(const memcached_st *self, const size_t s
     return self->allocators.malloc(self, size, self->allocators.context);
   }
 
+#ifdef __cplusplus
+  return std::malloc(size);
+#else
   return malloc(size);
+#endif
 }
 #define libmemcached_xmalloc(__memcachd_st, __type) ((__type *)libmemcached_malloc((__memcachd_st), sizeof(__type)))
 
@@ -68,7 +85,11 @@ static inline void *libmemcached_realloc(const memcached_st *self, void *mem, si
     return self->allocators.realloc(self, mem, nmemb * size, self->allocators.context);
   }
 
+#ifdef __cplusplus
+  return std::realloc(mem, size);
+#else
   return realloc(mem, size);
+#endif
 }
 #define libmemcached_xrealloc(__memcachd_st, __mem, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), (__mem), (__nelem), sizeof(__type)))
 #define libmemcached_xvalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), NULL, (__nelem), sizeof(__type)))
@@ -80,6 +101,10 @@ static inline void *libmemcached_calloc(const memcached_st *self, size_t nelem,
     return self->allocators.calloc(self, nelem, size, self->allocators.context);
   }
 
+#ifdef __cplusplus
+  return std::calloc(nelem, size);
+#else
   return calloc(nelem, size);
+#endif
 }
 #define libmemcached_xcalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_calloc((__memcachd_st), (__nelem), sizeof(__type)))