TEMPLATE MAGIC FOR GREAT JUSTICE

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

diff --git a/paxos.h b/paxos.h
index c7b1af4..170292a 100644 (file)
--- a/paxos.h
+++ b/paxos.h
@@ -30,18 +30,17 @@ class acceptor {
   std::map<unsigned,std::string> values;       // vals of each instance
 
   void commit_wo(unsigned instance, std::string v);
   std::map<unsigned,std::string> values;       // vals of each instance
 
   void commit_wo(unsigned instance, std::string v);

-  paxos_protocol::status preparereq(std::string src, 
-          paxos_protocol::preparearg a,
-          paxos_protocol::prepareres &r);
-  paxos_protocol::status acceptreq(std::string src, 
-          paxos_protocol::acceptarg a, bool &r);
-  paxos_protocol::status decidereq(std::string src, 
-          paxos_protocol::decidearg a, int &r);
+  paxos_protocol::status preparereq(paxos_protocol::prepareres &r,
+          std::string src, paxos_protocol::preparearg a);
+  paxos_protocol::status acceptreq(bool &r, std::string src,
+          paxos_protocol::acceptarg a);
+  paxos_protocol::status decidereq(int &r, std::string src,
+          paxos_protocol::decidearg a);

 
   friend class log;
 
  public:
 
   friend class log;
 
  public:

-  acceptor(class paxos_change *cfg, bool _first, std::string _me, 
+  acceptor(class paxos_change *cfg, bool _first, std::string _me,

        std::string _value);
   ~acceptor() {};
   void commit(unsigned instance, std::string v);
        std::string _value);
   ~acceptor() {};
   void commit(unsigned instance, std::string v);

@@ -73,10 +72,10 @@ class proposer {
   prop_t my_n;         // number of the last proposal used in this instance
 
   void setn();
   prop_t my_n;         // number of the last proposal used in this instance
 
   void setn();

-  bool prepare(unsigned instance, std::vector<std::string> &accepts, 
+  bool prepare(unsigned instance, std::vector<std::string> &accepts,

          std::vector<std::string> nodes,
          std::string &v);
          std::vector<std::string> nodes,
          std::string &v);

-  void accept(unsigned instance, std::vector<std::string> &accepts, 
+  void accept(unsigned instance, std::vector<std::string> &accepts,

         std::vector<std::string> nodes, std::string v);
   void decide(unsigned instance, std::vector<std::string> accepts,
         std::string v);
         std::vector<std::string> nodes, std::string v);
   void decide(unsigned instance, std::vector<std::string> accepts,
         std::string v);