Merge in fix for Ubuntu

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index 2b49c6085a4a8cde7e7effdbd916c89ba82dfad2..61c3209fc166993076ab10ecec2f7e1dc1376cc6 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -124,7 +124,7 @@ bool server_startup(server_startup_st *construct)
     std::string server_config_string;
 
     uint32_t port_base= 0;
-    for (uint32_t x= 0; x < (construct->count -1); x++)
+    for (uint32_t x= 0; x < uint32_t(construct->count -1); x++)
     {
       server_st *server= NULL;
 

diff --git a/libtest/server.h b/libtest/server.h
index f3bda21b99fa581b8b0e3ca2a5dc9ab8ae173177..00f29cd837b19c9c21630c7fbbf0be835d942b04 100644 (file)
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -124,7 +124,7 @@ std::ostream& operator<<(std::ostream& output, const server_st &arg);
 
 struct server_startup_st
 {
-  uint8_t count;
+  uint32_t count;
   uint8_t udp;
   std::string server_list;
   std::vector<server_st *> servers;