X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fmemcached.h;h=5b92d6356d6ea2d3c31a38d8ed461e88bf6aba3e;hb=857ca43d65fe6a52474641130312d26d125bef15;hp=62d3b1dc58669dffe38a7603a90765f857408e2b;hpb=dac48f2dbe34915755f8f4f7f88419f47dc9e27f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 62d3b1dc..5b92d635 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __MEMCACHED_H__
-#define __MEMCACHED_H__
+#ifndef __LIBMEMCACHED_MEMCACHED_H__
+#define __LIBMEMCACHED_MEMCACHED_H__
 
 #include <stdlib.h>
 #include <inttypes.h>
@@ -74,6 +74,10 @@ void *memcached_get_user_data(const memcached_st *ptr);
 LIBMEMCACHED_API
 void *memcached_set_user_data(memcached_st *ptr, void *data);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 
 struct memcached_st {
   /**
@@ -237,6 +241,7 @@ struct memcached_st {
 
   memcached_st& operator=(const memcached_st& source)
   { 
+    memcached_free(this);
     memcached_clone(this, &source);
 
     return *this;
@@ -245,16 +250,11 @@ struct memcached_st {
 #endif
 };
 
+
 // Local Only Inline
 static inline memcached_server_st *memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
 {
   return &ptr->servers[server_key];
 }
 
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-
-#endif /* __MEMCACHED_H__ */
+#endif /* __LIBMEMCACHED_MEMCACHED_H__ */