Merge in Ubuntu fixes.

[m6w6/libmemcached] / libmemcached / options / server.h

diff --git a/libmemcached/options/server.h b/libmemcached/options/server.h
index af6e0f3e9d4cde1183bcd5836b8948598b4a01a1..d86ad39a31ebc3af10bf9d18fc04e3176eabf826 100644 (file)
--- a/libmemcached/options/server.h
+++ b/libmemcached/options/server.h
@@ -38,19 +38,23 @@
 #pragma once
 
 #include <cstdlib>
-#include <iostream>
 #include <arpa/inet.h>
 
 struct server_t
 {
-  const char *c_str;
-  size_t length;
   in_port_t port;
+  uint32_t weight;
+  const char *c_str;
+  size_t size;
 };
 
+#if 0
+#include <iostream>
 inline std::ostream& operator<<(std::ostream& output, const server_t& arg)
 {
-  output.write(arg.c_str, arg.length);
+  output.write(arg.c_str, arg.size);
   output << ':' << arg.port;
+  output << '+' << arg.weight;
   return output;
 }
+#endif