From: Brian Aker Date: Fri, 8 Jul 2011 01:03:26 +0000 (-0700) Subject: Merge in fix for Ubuntu X-Git-Tag: 0.51~1^2~7^2 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=14b03373f1e507ec2600b0d1ad3324e5a4a222e0;p=m6w6%2Flibmemcached Merge in fix for Ubuntu --- diff --git a/libtest/memcached.cc b/libtest/memcached.cc index 2b49c608..61c3209f 100644 --- 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 f3bda21b..00f29cd8 100644 --- 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 servers;