TEMPLATE MAGIC FOR GREAT JUSTICE

[invirt/third/libt4.git] / lock_client_cache_rsm.cc

diff --git a/lock_client_cache_rsm.cc b/lock_client_cache_rsm.cc
index c0be985..2a6d6e3 100644 (file)
--- a/lock_client_cache_rsm.cc
+++ b/lock_client_cache_rsm.cc
@@ -59,8 +59,8 @@ lock_client_cache_rsm::lock_client_cache_rsm(string xdst, class lock_release_use
     id = host.str();
     last_port = rlock_port;
     rpcs *rlsrpc = new rpcs(rlock_port);
     id = host.str();
     last_port = rlock_port;
     rpcs *rlsrpc = new rpcs(rlock_port);

-    rlsrpc->reg(rlock_protocol::revoke, this, &lock_client_cache_rsm::revoke_handler);
-    rlsrpc->reg(rlock_protocol::retry, this, &lock_client_cache_rsm::retry_handler);
+    rlsrpc->reg(rlock_protocol::revoke, &lock_client_cache_rsm::revoke_handler, this);
+    rlsrpc->reg(rlock_protocol::retry, &lock_client_cache_rsm::retry_handler, this);

     {
         lock sl(xid_mutex);
         xid = 0;
     {
         lock sl(xid_mutex);
         xid = 0;

@@ -178,7 +178,7 @@ lock_protocol::status lock_client_cache_rsm::release(lock_protocol::lockid_t lid
     return lock_protocol::OK;
 }
 
     return lock_protocol::OK;
 }
 

-rlock_protocol::status lock_client_cache_rsm::revoke_handler(lock_protocol::lockid_t lid, lock_protocol::xid_t xid, int &) {
+rlock_protocol::status lock_client_cache_rsm::revoke_handler(int &, lock_protocol::lockid_t lid, lock_protocol::xid_t xid) {

     LOG("Revoke handler " << lid << " " << xid);
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);
     LOG("Revoke handler " << lid << " " << xid);
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);

@@ -201,7 +201,7 @@ rlock_protocol::status lock_client_cache_rsm::revoke_handler(lock_protocol::lock
     return rlock_protocol::OK;
 }
 
     return rlock_protocol::OK;
 }
 

-rlock_protocol::status lock_client_cache_rsm::retry_handler(lock_protocol::lockid_t lid, lock_protocol::xid_t xid, int &) {
+rlock_protocol::status lock_client_cache_rsm::retry_handler(int &, lock_protocol::lockid_t lid, lock_protocol::xid_t xid) {

     lock_state &st = get_lock_state(lid);
     lock sl(st.m);
     VERIFY(st.state == lock_state::acquiring);
     lock_state &st = get_lock_state(lid);
     lock sl(st.m);
     VERIFY(st.state == lock_state::acquiring);