Updated pandora-build files to version 0.131

[m6w6/libmemcached] / libhashkit / hashkit.h

diff --git a/libhashkit/hashkit.h b/libhashkit/hashkit.h
index 1def040dc7cfd44c311feae5e28facf482b278e7..451333075f225c83641647dcd93065db946935f1 100644 (file)
--- a/libhashkit/hashkit.h
+++ b/libhashkit/hashkit.h
@@ -1,5 +1,5 @@
 /* HashKit
- * Copyright (C) 2009 Brian Aker
+ * Copyright (C) 2009-2010 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -9,22 +9,47 @@
 #ifndef HASHKIT_H
 #define HASHKIT_H
 
+
 #if !defined(__cplusplus)
 # include <stdbool.h>
 #endif
 #include <inttypes.h>
 #include <sys/types.h>
 #include <libhashkit/visibility.h>
+#include <libhashkit/configure.h>
 #include <libhashkit/types.h>
 #include <libhashkit/algorithm.h>
 #include <libhashkit/behavior.h>
+#include <libhashkit/digest.h>
 #include <libhashkit/function.h>
 #include <libhashkit/strerror.h>
 
 #ifdef __cplusplus
+
+#include <string>
+
 extern "C" {
 #endif
 
+HASHKIT_API
+hashkit_st *hashkit_create(hashkit_st *hash);
+
+HASHKIT_API
+hashkit_st *hashkit_clone(hashkit_st *destination, const hashkit_st *ptr);
+
+HASHKIT_API
+bool hashkit_compare(const hashkit_st *first, const hashkit_st *second);
+
+HASHKIT_API
+void hashkit_free(hashkit_st *hash);
+
+#define hashkit_is_allocated(__object) ((__object)->options.is_allocated)
+#define hashkit_is_initialized(__object) ((__object)->options.is_initialized)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 struct hashkit_st
 {
   struct hashkit_function_st {
@@ -41,25 +66,60 @@ struct hashkit_st
   } options;
 };
 
-HASHKIT_API
-hashkit_st *hashkit_create(hashkit_st *hash);
+#ifdef __cplusplus
+class Hashkit : private hashkit_st {
 
-HASHKIT_API
-hashkit_st *hashkit_clone(hashkit_st *destination, const hashkit_st *ptr);
+public:
 
-HASHKIT_API
-bool hashkit_compare(const hashkit_st *first, const hashkit_st *second);
+  Hashkit()
+  {
+    hashkit_create(this);
+  }
 
-HASHKIT_API
-void hashkit_free(hashkit_st *hash);
+  Hashkit(const Hashkit& source)
+  {
+    hashkit_clone(this, &source);
+  }
 
-#define hashkit_is_allocated(__object) ((__object)->options.is_allocated)
-#define hashkit_is_initialized(__object) ((__object)->options.is_initialized)
+  Hashkit& operator=(const Hashkit& source)
+  {
+    hashkit_free(this);
+    hashkit_clone(this, &source);
 
-/** @} */
+    return *this;
+  }
 
-#ifdef __cplusplus
-}
+  friend bool operator==(const Hashkit &left, const Hashkit &right)
+  {
+    return hashkit_compare(&left, &right);
+  }
+
+  uint32_t digest(std::string& str)
+  {
+    return hashkit_digest(this, str.c_str(), str.length());
+  }
+
+  uint32_t digest(const char *key, size_t key_length)
+  {
+    return hashkit_digest(this, key, key_length);
+  }
+
+  hashkit_return_t set_function(hashkit_hash_algorithm_t hash_algorithm)
+  {
+    return hashkit_set_function(this, hash_algorithm);
+  }
+
+  hashkit_return_t set_distribution_function(hashkit_hash_algorithm_t hash_algorithm)
+  {
+    return hashkit_set_function(this, hash_algorithm);
+  }
+
+  ~Hashkit()
+  {
+    hashkit_free(this);
+  }
+};
 #endif
 
+
 #endif /* HASHKIT_H */