Clean-ups

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

diff --git a/lock_server.cc b/lock_server.cc
index 141a598..efb23f5 100644 (file)
--- a/lock_server.cc
+++ b/lock_server.cc
@@ -39,8 +39,7 @@ lock_server::lock_server(rsm & r) : rsm_ (&r) {
 
 void lock_server::revoker () {
     while (1) {
-        lock_protocol::lockid_t lid;
-        revoke_fifo.deq(&lid);
+        lock_protocol::lockid_t lid = revoke_fifo.deq();
         LOG << "Revoking " << lid;
         if (rsm_ && !rsm_->amiprimary())
             continue;
@@ -60,8 +59,7 @@ void lock_server::revoker () {
 
 void lock_server::retryer() {
     while (1) {
-        lock_protocol::lockid_t lid;
-        retry_fifo.deq(&lid);
+        lock_protocol::lockid_t lid = retry_fifo.deq();
         if (rsm_ && !rsm_->amiprimary())
             continue;