More cleanups to marshalling logic.

[invirt/third/libt4.git] / lock_server_cache_rsm.h

diff --git a/lock_server_cache_rsm.h b/lock_server_cache_rsm.h
index 4a33361..c33b51e 100644 (file)
--- a/lock_server_cache_rsm.h
+++ b/lock_server_cache_rsm.h
@@ -23,6 +23,7 @@ typedef pair<callback, lock_protocol::xid_t> holder;
 class lock_state {
 public:
     lock_state();
+    lock_state(const lock_state &other);
     bool held;
     holder held_by;
     list<holder> wanted_by;
@@ -44,13 +45,13 @@ class lock_server_cache_rsm : public rsm_state_transfer {
         class rsm *rsm;
     public:
         lock_server_cache_rsm(class rsm *rsm = 0);
-        lock_protocol::status stat(lock_protocol::lockid_t, int &);
+        lock_protocol::status stat(int &, lock_protocol::lockid_t);
         void revoker();
         void retryer();
         string marshal_state();
         void unmarshal_state(string state);
-        int acquire(lock_protocol::lockid_t, string id, lock_protocol::xid_t, int &);
-        int release(lock_protocol::lockid_t, string id, lock_protocol::xid_t, int &);
+        int acquire(int &, lock_protocol::lockid_t, string id, lock_protocol::xid_t);
+        int release(int &, lock_protocol::lockid_t, string id, lock_protocol::xid_t);
 };
 
 #endif