From: Brian Aker <brian@tangent.org>
Date: Mon, 18 Jun 2012 15:40:21 +0000 (-0700)
Subject: Merge in trunk
X-Git-Tag: 1.0.9~16
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Flibmemcached;a=commitdiff_plain;h=999006a8904a0f08293f1df7bda81bff914b091a;hp=ca663a567bc8d3facb22b035bcad19349e42a9b1

Merge in trunk
---

diff --git a/libmemcached/auto.cc b/libmemcached/auto.cc
index 3054368b..adce3348 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 bc931de6..587e1c8a 100644
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -281,7 +281,7 @@ memcached_return_t memcached_set_error(memcached_instance_st& self, memcached_re
 
   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 6afcce9a..ef790922 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 97470048..88d87fe3 100644
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -299,10 +299,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 c7835247..757ddfdf 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 39810dec..7b05ef42 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") }
   };
 
diff --git a/libtest/memcached.hpp.moved b/libtest/memcached.hpp.moved
new file mode 100644
index 00000000..c4953975
--- /dev/null
+++ b/libtest/memcached.hpp.moved
@@ -0,0 +1,70 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once
+
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
+inline bool operator== (const memcached_st& memc, const memcached_return_t rc)
+{
+  if (memcached_last_error(&memc) == rc)
+  {
+    return true;
+  }
+
+  return false;
+}
+
+inline bool operator!= (const memcached_st& memc, const memcached_return_t rc)
+{
+  if (memcached_last_error(&memc) != rc)
+  {
+    return true;
+  }
+
+  return false;
+}
+
+inline bool operator!= (const memcached_return_t rc, const memcached_st& memc)
+{
+  if (memcached_last_error(&memc) != rc)
+  {
+    return true;
+  }
+
+  return false;
+}
+#endif
+