Merge in updates to all docs/etc.

[m6w6/libmemcached] / libhashkit / hashkit.h

diff --git a/libhashkit/hashkit.h b/libhashkit/hashkit.h
index e3d5862e905f6f5867bde504e83a9136f87009c1..2d8ad3a2d38aafdaa66737a29921227b96deedc7 100644 (file)
--- a/libhashkit/hashkit.h
+++ b/libhashkit/hashkit.h
@@ -22,12 +22,10 @@
 #include <libhashkit/behavior.h>
 #include <libhashkit/digest.h>
 #include <libhashkit/function.h>
+#include <libhashkit/str_algorithm.h>
 #include <libhashkit/strerror.h>
 
 #ifdef __cplusplus
-
-#include <string>
-
 extern "C" {
 #endif
 
@@ -58,66 +56,72 @@ struct hashkit_st
   } base_hash, distribution_hash;
 
   struct {
-    bool is_base_same_distributed HASHKIT_BITFIELD;
+    bool is_base_same_distributed:1;
   } flags;
 
   struct {
-    bool is_allocated HASHKIT_BITFIELD;
+    bool is_allocated:1;
   } options;
 };
 
 #ifdef __cplusplus
-class Hashkit : private hashkit_st {
+
+#include <string>
+
+class Hashkit {
 
 public:
 
   Hashkit()
   {
-    hashkit_create(this);
+    hashkit_create(&self);
   }
 
   Hashkit(const Hashkit& source)
   {
-    hashkit_clone(this, &source);
+    hashkit_clone(&self, &source.self);
   }
 
   Hashkit& operator=(const Hashkit& source)
   {
-    hashkit_free(this);
-    hashkit_clone(this, &source);
+    hashkit_free(&self);
+    hashkit_clone(&self, &source.self);
 
     return *this;
   }
 
   friend bool operator==(const Hashkit &left, const Hashkit &right)
   {
-    return hashkit_compare(&left, &right);
+    return hashkit_compare(&left.self, &right.self);
   }
 
   uint32_t digest(std::string& str)
   {
-    return hashkit_digest(this, str.c_str(), str.length());
+    return hashkit_digest(&self, str.c_str(), str.length());
   }
 
   uint32_t digest(const char *key, size_t key_length)
   {
-    return hashkit_digest(this, key, key_length);
+    return hashkit_digest(&self, key, key_length);
   }
 
   hashkit_return_t set_function(hashkit_hash_algorithm_t hash_algorithm)
   {
-    return hashkit_set_function(this, hash_algorithm);
+    return hashkit_set_function(&self, hash_algorithm);
   }
 
   hashkit_return_t set_distribution_function(hashkit_hash_algorithm_t hash_algorithm)
   {
-    return hashkit_set_function(this, hash_algorithm);
+    return hashkit_set_function(&self, hash_algorithm);
   }
 
   ~Hashkit()
   {
-    hashkit_free(this);
+    hashkit_free(&self);
   }
+private:
+
+  hashkit_st self;
 };
 #endif