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

[m6w6/libmemcached] / libmemcached / delete.cc

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) ||