More clean-ups

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

diff --git a/paxos.h b/paxos.h
index 79924a3..20e249c 100644 (file)
--- a/paxos.h
+++ b/paxos.h
@@ -46,8 +46,7 @@ class proposer_acceptor {
         friend class log;
         class log l = {this, me};
 
         friend class log;
         class log l = {this, me};
 

-        void commit(unsigned instance, const value_t & v);
-        void commit(unsigned instance, const value_t & v, lock & pxs_mutex_lock);
+        void commit(unsigned instance, const value_t & v, lock & acceptor_mutex_lock);

 
         paxos_protocol::status preparereq(prepareres & r, const node_t & src, unsigned instance, prop_t n);
         paxos_protocol::status acceptreq(bool & r, const node_t & src, unsigned instance, prop_t n, const value_t & v);
 
         paxos_protocol::status preparereq(prepareres & r, const node_t & src, unsigned instance, prop_t n);
         paxos_protocol::status acceptreq(bool & r, const node_t & src, unsigned instance, prop_t n, const value_t & v);