Merge in all of libtest updates.

[m6w6/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index f5fe62e19bf3729fe867c1542c29bc286196ee45..955e1b30a248e414752663320cc00368a5cb7e16 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -313,7 +313,7 @@ uint32_t memcached_server_count(const memcached_st *self)
   return self->number_of_hosts;
 }
 
-const char *memcached_server_name(memcached_server_instance_st self)
+const char *memcached_server_name(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -322,7 +322,7 @@ const char *memcached_server_name(memcached_server_instance_st self)
   return self->hostname;
 }
 
-in_port_t memcached_server_port(memcached_server_instance_st self)
+in_port_t memcached_server_port(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -331,7 +331,7 @@ in_port_t memcached_server_port(memcached_server_instance_st self)
   return self->port;
 }
 
-uint32_t memcached_server_response_count(memcached_server_instance_st self)
+uint32_t memcached_server_response_count(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -340,7 +340,7 @@ uint32_t memcached_server_response_count(memcached_server_instance_st self)
   return self->cursor_active;
 }
 
-const char *memcached_server_type(memcached_server_instance_st ptr)
+const char *memcached_server_type(const memcached_server_instance_st ptr)
 {
   if (ptr)
   {