Got rid of most using directives. Ported tests to python.

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

diff --git a/paxos.h b/paxos.h
index 2ddf583..79924a3 100644 (file)
--- a/paxos.h
+++ b/paxos.h
@@ -22,13 +22,12 @@ extern bool majority(const nodes_t & l1, const nodes_t & l2);
 
 class proposer_acceptor {
     private:
 
 class proposer_acceptor {
     private:

-        mutex proposer_mutex;
-        mutex acceptor_mutex;
+        std::mutex proposer_mutex, acceptor_mutex;

 
         paxos_change *delegate;
         node_t me;
 
 
         paxos_change *delegate;
         node_t me;
 

-        rpcs pxs{(in_port_t)stoi(me)};
+        rpcs pxs{(in_port_t)std::stoi(me)};

 
         bool break1 = false;
         bool break2 = false;
 
         bool break1 = false;
         bool break2 = false;

@@ -42,7 +41,7 @@ class proposer_acceptor {
         prop_t accepted = {0, me};  // number of highest proposal accepted
         value_t accepted_value;     // value of highest proposal accepted
         unsigned instance_h = 0;    // number of the highest instance we have decided
         prop_t accepted = {0, me};  // number of highest proposal accepted
         value_t accepted_value;     // value of highest proposal accepted
         unsigned instance_h = 0;    // number of the highest instance we have decided

-        map<unsigned,value_t> values;   // vals of each instance
+        std::map<unsigned,value_t> values;   // vals of each instance

 
         friend class log;
         class log l = {this, me};
 
         friend class log;
         class log l = {this, me};