Merge with build trunk.

[m6w6/libmemcached] / libtest / blobslap_worker.cc

diff --git a/libtest/blobslap_worker.cc b/libtest/blobslap_worker.cc
index d86840580415c773be85fb433b9a30b54b1e5fc9..fe1cdce31baeaa6f75b72fd1b5bd1596dbf93cc0 100644 (file)
--- a/libtest/blobslap_worker.cc
+++ b/libtest/blobslap_worker.cc
@@ -127,7 +127,7 @@ public:
     return "--daemon";
   }
 
-  void has_port_option() const
+  bool has_port_option() const
   {
     return true;
   }
@@ -142,17 +142,17 @@ public:
     return true;
   }
 
-  bool build(int argc, const char *argv[]);
+  bool build(size_t argc, const char *argv[]);
 };
 
 
 #include <sstream>
 
-bool BlobslapWorker::build(int argc, const char *argv[])
+bool BlobslapWorker::build(size_t argc, const char *argv[])
 {
   std::stringstream arg_buffer;
 
-  for (int x= 1 ; x < argc ; x++)
+  for (size_t x= 0 ; x < argc ; x++)
   {
     add_option(argv[x]);
   }