Fixed compilation in mac os x snow leopard when compiling a 32 bit binary.

[redis.git] / client-libraries / cpp / redisclient.h

diff --git a/client-libraries/cpp/redisclient.h b/client-libraries/cpp/redisclient.h
index b1fbb582fb1a76cdcfbdec4a19a0e40e2c3b55a9..b51da8f9533fc3151ab5ceb23e14170119241260 100644 (file)
--- a/client-libraries/cpp/redisclient.h
+++ b/client-libraries/cpp/redisclient.h
@@ -39,6 +39,12 @@
 
 namespace redis 
 {
+  enum server_role
+  {
+    role_master,
+    role_slave
+  };
+
   struct server_info 
   {
     std::string version;
@@ -52,6 +58,7 @@ namespace redis
     unsigned long total_commands_processed;
     unsigned long uptime_in_seconds;
     unsigned long uptime_in_days;
+    server_role role;
   };
 
   // Generic error that is thrown when communicating with the redis server.
@@ -355,8 +362,9 @@ namespace redis
 
     // Compute the intersection between the sets stored at key1, key2, ..., 
     // keyN, and store the resulting set at dstkey
+    // Returns the number of items in the intersection
 
-    void sinterstore(const string_type & dstkey, const string_vector & keys);
+    int_type sinterstore(const string_type & dstkey, const string_vector & keys);
 
     // Return the union between the sets stored at key1, key2, ..., keyN
 
@@ -364,8 +372,9 @@ namespace redis
 
     // Compute the union between the sets stored at key1, key2, ..., keyN, 
     // and store the resulting set at dstkey
+    // Returns the number of items in the intersection
 
-    void sunionstore(const string_type & dstkey, const string_vector & keys);
+    int_type sunionstore(const string_type & dstkey, const string_vector & keys);
 
     // Return all the members of the set value at key
 
@@ -421,7 +430,7 @@ namespace redis
                   const string_type & by_pattern, 
                   int_type limit_start, 
                   int_type limit_end, 
-                  const string_type & get_pattern, 
+                  const string_vector & get_patterns, 
                   sort_order order = sort_order_ascending,
                   bool lexicographically = false);