Fix style issue in delete. Fix test case which was not using versioned hashkit.

diff --git a/libmemcached/delete.cc b/libmemcached/delete.cc
index 669d8ae130e5c5f7b118fae59e66ef311734da49..5244f0db4862555070f4cc36f886d28b80921793 100644 (file)
--- a/libmemcached/delete.cc
+++ b/libmemcached/delete.cc
@@ -84,7 +84,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
 
   if (ptr->flags.binary_protocol)
   {
-    likely (! expiration)
+    if (expiration == 0)
     {
       rc= binary_delete(ptr, server_key, key, key_length, to_write);
     }
@@ -97,7 +97,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr,
   {
     int send_length;
 
-    unlikely (expiration)
+    if (expiration)
     {
        if ((instance->major_version == 1 &&
             instance->minor_version > 2) ||

diff --git a/tests/hash_plus.cc b/tests/hash_plus.cc
index 3d2545ab66e9987dcad260ddc74468459b57bc8b..fada2a6f8c0772ce36de93353aaca22a2a4055f3 100644 (file)
--- a/tests/hash_plus.cc
+++ b/tests/hash_plus.cc
@@ -10,7 +10,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <libhashkit/hashkit.hpp>
+#include <libhashkit-1.0/hashkit.hpp>
 
 using namespace libtest;