From b5a4a113c48e7899223de67cfe043b886a1736ac Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Mon, 18 Jun 2012 00:39:23 -0400 Subject: [PATCH] Fixes for Fedora 17. --- libmemcached/auto.cc | 2 +- libmemcached/dump.cc | 2 +- libmemcached/error.cc | 2 +- libmemcached/flush.cc | 2 +- libmemcached/storage.cc | 8 ++++---- libmemcached/touch.cc | 2 +- libmemcached/verbosity.cc | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libmemcached/auto.cc b/libmemcached/auto.cc index df4ceb2f..b75ae38d 100644 --- a/libmemcached/auto.cc +++ b/libmemcached/auto.cc @@ -83,7 +83,7 @@ static memcached_return_t text_incr_decr(memcached_server_write_instance_st inst { memcached_literal_param("incr ") }, { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) }, { key, key_length }, - { buffer, send_length }, + { buffer, size_t(send_length) }, { " noreply", reply ? 0 : memcached_literal_param_size(" noreply") }, { memcached_literal_param("\r\n") } }; diff --git a/libmemcached/dump.cc b/libmemcached/dump.cc index 8a2ba144..05b4e5d6 100644 --- a/libmemcached/dump.cc +++ b/libmemcached/dump.cc @@ -61,7 +61,7 @@ static memcached_return_t ascii_dump(memcached_st *memc, memcached_dump_fn *call libmemcached_io_vector_st vector[]= { { memcached_literal_param("stats cachedump ") }, - { buffer, buffer_length }, + { buffer, size_t(buffer_length) }, { memcached_literal_param(" 0\r\n") } }; diff --git a/libmemcached/error.cc b/libmemcached/error.cc index 96a5532b..b9d948ff 100644 --- a/libmemcached/error.cc +++ b/libmemcached/error.cc @@ -281,7 +281,7 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu size+= append_host_to_string(self, hostname_port_message_ptr, sizeof(hostname_port_message) -size); - memcached_string_t error_host= { hostname_port_message, size }; + memcached_string_t error_host= { hostname_port_message, size_t(size) }; assert(self.root); if (self.root == NULL) diff --git a/libmemcached/flush.cc b/libmemcached/flush.cc index 6b8ea4b0..989555e2 100644 --- a/libmemcached/flush.cc +++ b/libmemcached/flush.cc @@ -121,7 +121,7 @@ static memcached_return_t memcached_flush_textual(memcached_st *ptr, { { NULL, 0 }, { memcached_literal_param("flush_all ") }, - { buffer, send_length }, + { buffer, size_t(send_length) }, { " noreply", reply ? 0 : memcached_literal_param_size(" noreply") }, { memcached_literal_param("\r\n") } }; diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc index 40c8d34d..8462119d 100644 --- a/libmemcached/storage.cc +++ b/libmemcached/storage.cc @@ -298,10 +298,10 @@ static memcached_return_t memcached_send_ascii(memcached_st *ptr, { storage_op_string(verb), strlen(storage_op_string(verb))}, { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) }, { key, key_length }, - { flags_buffer, flags_buffer_length }, - { expiration_buffer, expiration_buffer_length }, - { value_buffer, value_buffer_length }, - { cas_buffer, cas_buffer_length }, + { flags_buffer, size_t(flags_buffer_length) }, + { expiration_buffer, size_t(expiration_buffer_length) }, + { value_buffer, size_t(value_buffer_length) }, + { cas_buffer, size_t(cas_buffer_length) }, { " noreply", reply ? 0 : memcached_literal_param_size(" noreply") }, { memcached_literal_param("\r\n") }, { value, value_length }, diff --git a/libmemcached/touch.cc b/libmemcached/touch.cc index b7fa2475..81502421 100644 --- a/libmemcached/touch.cc +++ b/libmemcached/touch.cc @@ -56,7 +56,7 @@ static memcached_return_t ascii_touch(memcached_server_write_instance_st instanc { memcached_literal_param("touch ") }, { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) }, { key, key_length }, - { expiration_buffer, expiration_buffer_length }, + { expiration_buffer, size_t(expiration_buffer_length) }, { memcached_literal_param("\r\n") } }; diff --git a/libmemcached/verbosity.cc b/libmemcached/verbosity.cc index 334a3316..032baad1 100644 --- a/libmemcached/verbosity.cc +++ b/libmemcached/verbosity.cc @@ -96,7 +96,7 @@ memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity) { { NULL, 0 }, { memcached_literal_param("verbosity ") }, - { buffer, send_length }, + { buffer, size_t(send_length) }, { memcached_literal_param("\r\n") } }; -- 2.30.2