Merge in touch.

[awesomized/libmemcached] / libmemcachedutil / version.cc

diff --git a/libmemcachedutil/version.cc b/libmemcachedutil/version.cc
index abfd47f71cffef0f540c076c1d03776ec19f2656..15f888b875b7fd5baef93ee8db35be999b1ab990 100644 (file)
--- a/libmemcachedutil/version.cc
+++ b/libmemcachedutil/version.cc
@@ -37,6 +37,7 @@
 
 
 #include <libmemcachedutil/common.h>
+#include <cassert>
 
 struct local_context
 {
@@ -55,8 +56,8 @@ static memcached_return_t check_server_version(const memcached_st *,
   struct local_context *check= (struct local_context *)context;
 
   if (instance->major_version != UINT8_MAX &&
-      instance->major_version >= check->major_version &&
-      instance->minor_version >= check->minor_version &&
+      instance->major_version >= check->major_version and
+      instance->minor_version >= check->minor_version and
       instance->micro_version >= check->micro_version )
   {
     return MEMCACHED_SUCCESS;
@@ -72,8 +73,10 @@ bool libmemcached_util_version_check(memcached_st *memc,
                                      uint8_t minor_version,
                                      uint8_t micro_version)
 {
-  if (memcached_version(memc) != MEMCACHED_SUCCESS)
+  if (memcached_failed(memcached_version(memc)))
+  {
     return false;
+  }
 
   struct local_context check= { major_version, minor_version, micro_version, true };