Merged trunk.

[m6w6/libmemcached] / libmemcached / memcached.hh

diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 5687956671f4d2e91f26858b887abee4fbda1431..d13ca23a7c0217d3811bac7a5e60536c193f02a4 100644 (file)
--- a/libmemcached/memcached.hh
+++ b/libmemcached/memcached.hh
@@ -1,8 +1,4 @@
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface                       /* gcc class implementation */
-#endif
-
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 #include <string.h>
 #include <stdio.h>
 
@@ -50,7 +46,7 @@ public:
                                 value_length, &flags, &rc);
   }
 
-  memcached_return mget(char **keys, size_t *key_length, 
+  memcached_return mget(const char **keys, size_t *key_length, 
                         unsigned int number_of_keys)
   {
 
@@ -146,20 +142,20 @@ public:
                                    value, value_length, 0, 0);
   }
   memcached_return  cas(const char *key, const char *value, 
-                        size_t value_length, uint64_t cas)
+                        size_t value_length, uint64_t cas_arg)
   {
     return memcached_cas(&memc, key, strlen(key),
-                    value, value_length, 0, 0, cas);
+                    value, value_length, 0, 0, cas_arg);
   }
   memcached_return  cas_by_key(const char *master_key, const char *key, 
                                const char *value, size_t value_length, 
-                               uint64_t cas)
+                               uint64_t cas_arg)
   {
     return memcached_cas_by_key(&memc,
                                 master_key, strlen(master_key),
                                 key, strlen(key),
                                 value, value_length,
-                                0, 0, cas);
+                                0, 0, cas_arg);
   }
   // using 'remove' vs. 'delete' since 'delete' is a keyword 
   memcached_return remove(const char *key)