X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/24bebc0ecf83446c7371eff69042322aab34976a..4e881433f37417ccbda89c09ffdf936855d462d4:/paxos.h

diff --git a/paxos.h b/paxos.h
index 426dfef..db18e6c 100644
--- a/paxos.h
+++ b/paxos.h
@@ -7,10 +7,9 @@
 #include "log.h"
 
 using prepareres = paxos_protocol::prepareres;
-
-using node_t = string;
-using nodes_t = vector<node_t>;
-using value_t = string;
+using node_t = paxos_protocol::node_t;
+using nodes_t = paxos_protocol::nodes_t;
+using value_t = paxos_protocol::value_t;
 
 class paxos_change {
     public:
@@ -29,7 +28,7 @@ class proposer_acceptor {
         paxos_change *delegate;
         node_t me;
 
-        rpcs pxs = {(uint32_t)std::stoi(me)};
+        rpcs pxs{(in_port_t)stoi(me)};
 
         bool break1 = false;
         bool break2 = false;
@@ -46,7 +45,7 @@ class proposer_acceptor {
         map<unsigned,value_t> values;   // vals of each instance
 
         friend class log;
-        log l = {this, me};
+        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);