Merge

[m6w6/libmemcached] / libtest / memcached.cc

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index ffb21c9d504154f3a47af9e4008e91c9fbecfe6c..dd2ac1d642a1a9a1ac3fbf2e43e1c5a52f2517cf 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -134,7 +134,7 @@ public:
       ret= libmemcached_util_ping(hostname().c_str(), port(), &rc);
     }
 
-    if (memcached_failed(rc) or not ret)
+    if (memcached_failed(rc) or ret == false)
     {
       Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc);
     }
@@ -355,8 +355,6 @@ public:
 
 bool Memcached::build(size_t argc, const char *argv[])
 {
-  std::stringstream arg_buffer;
-
   if (getuid() == 0 or geteuid() == 0)
   {
     add_option("-u", "root");