Merging bzr://localhost/libmemcached/994772 to Build branch

[m6w6/libmemcached] / libmemcached / io.hpp

diff --git a/libmemcached/io.hpp b/libmemcached/io.hpp
index d91150f8cd70e3cfdae5e9aa578b0a7c2ef1370b..549f86a058eb2e4939b566bdbfad5c9fa5b352cf 100644 (file)
--- a/libmemcached/io.hpp
+++ b/libmemcached/io.hpp
@@ -38,23 +38,21 @@
 
 #pragma once
 
-size_t io_vector_total_size(libmemcached_io_vector_st* vector, const size_t number_of);
-
 bool memcached_io_write(memcached_server_write_instance_st ptr);
 
 ssize_t memcached_io_write(memcached_server_write_instance_st ptr,
                            const void *buffer, size_t length, bool with_flush);
 
 ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
-                            const struct libmemcached_io_vector_st *vector,
-                            size_t number_of, bool with_flush);
+                            libmemcached_io_vector_st vector[],
+                            const size_t number_of, const bool with_flush);
 
 memcached_return_t memcached_io_wait_for_write(memcached_server_write_instance_st ptr);
 
 void memcached_io_reset(memcached_server_write_instance_st ptr);
 
 memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
-                                     void *buffer, size_t length, ssize_t *nread);
+                                     void *buffer, size_t length, ssize_t& nread);
 
 /* Read a line (terminated by '\n') into the buffer */
 memcached_return_t memcached_io_readline(memcached_server_write_instance_st ptr,