Removed tabs and unneeded constructor

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

diff --git a/paxos.cc b/paxos.cc
index f9d5785..3166c92 100644 (file)
--- a/paxos.cc
+++ b/paxos.cc
@@ -20,7 +20,7 @@ bool majority(const nodes_t &l1, const nodes_t &l2) {
 // paxos_commit to inform higher layers of the agreed value for this
 // instance.
 
 // paxos_commit to inform higher layers of the agreed value for this
 // instance.
 

-proposer_acceptor::proposer_acceptor(class paxos_change *_delegate,
+proposer_acceptor::proposer_acceptor(paxos_change *_delegate,

         bool _first, const node_t & _me, const value_t & _value)
     : delegate(_delegate), me (_me)
 {
         bool _first, const node_t & _me, const value_t & _value)
     : delegate(_delegate), me (_me)
 {

@@ -46,7 +46,7 @@ bool proposer_acceptor::run(unsigned instance, const nodes_t & cur_nodes, const
     }
     stable = false;
     bool r = false;
     }
     stable = false;
     bool r = false;

-    proposal.n = std::max(promise.n, proposal.n) + 1;
+    proposal.n = max(promise.n, proposal.n) + 1;

     nodes_t accepts;
     value_t v = newv;
     if (prepare(instance, accepts, cur_nodes, v)) {
     nodes_t accepts;
     value_t v = newv;
     if (prepare(instance, accepts, cur_nodes, v)) {