Major clean-ups. Migrating to C++11.

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

diff --git a/paxos.h b/paxos.h
index 7188edb..c7b1af4 100644 (file)
--- a/paxos.h
+++ b/paxos.h
@@ -3,15 +3,14 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include "rpc.h"
+#include "rpc/rpc.h"

 #include "paxos_protocol.h"
 #include "log.h"
 #include "paxos_protocol.h"
 #include "log.h"

-#include "mutex.h"

 
 
 class paxos_change {
  public:
 
 
 class paxos_change {
  public:

-  virtual void paxos_commit(unsigned instance, std::string v) = 0;
+  virtual void paxos_commit(unsigned instance, const std::string &v) = 0;

   virtual ~paxos_change() {};
 };
 
   virtual ~paxos_change() {};
 };
 

@@ -21,7 +20,7 @@ class acceptor {
   rpcs *pxs;
   paxos_change *cfg;
   std::string me;
   rpcs *pxs;
   paxos_change *cfg;
   std::string me;

-  mutex pxs_mutex;
+  std::mutex pxs_mutex;

 
   // Acceptor state
   prop_t n_h;          // number of the highest proposal seen in a prepare
 
   // Acceptor state
   prop_t n_h;          // number of the highest proposal seen in a prepare

@@ -67,7 +66,7 @@ class proposer {
   bool break1;
   bool break2;
 
   bool break1;
   bool break2;
 

-  mutex pxs_mutex;
+  std::mutex pxs_mutex;

 
   // Proposer state
   bool stable;
 
   // Proposer state
   bool stable;