Merge in namespace fixes for binary protocol.

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 40f45111826a9f840212990c67f72b10941a5305..98072cb3138d4266994173ff4d59b63e1eadd838 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -66,6 +66,7 @@
 #include <libmemcached/memcached.h>
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
+#include <libmemcached/namespace.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -141,10 +142,13 @@ memcached_return_t run_distribution(memcached_st *ptr);
 LIBMEMCACHED_LOCAL
 void set_last_disconnected_host(memcached_server_write_instance_st ptr);
 
+#ifdef __cplusplus
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_key_test(const char * const *keys,
+memcached_return_t memcached_key_test(const memcached_st& memc,
+                                      const char * const *keys,
                                       const size_t *key_length,
                                       size_t number_of_keys);
+#endif
 
 LIBMEMCACHED_LOCAL
 memcached_return_t memcached_purge(memcached_server_write_instance_st ptr);
@@ -161,7 +165,9 @@ memcached_server_st *memcached_server_create_with(const memcached_st *memc,
 static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool binary)
 {
   unlikely (key_length == 0)
+  {
     return MEMCACHED_BAD_KEY_PROVIDED;
+  }
 
   if (binary)
   {