Cosmetic changes

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

diff --git a/paxos_protocol.h b/paxos_protocol.h
index c61e2eb..3e1fbcd 100644 (file)
--- a/paxos_protocol.h
+++ b/paxos_protocol.h
@@ -12,20 +12,17 @@ struct prop_t {
     LEXICOGRAPHIC_COMPARISON(prop_t)
 };
 
-MARSHALLABLE_STRUCT(prop_t)
-
 namespace paxos_protocol {
     enum status : rpc_protocol::status { OK, ERR };
     struct prepareres {
-        bool oldinstance;
-        bool accept;
+        enum { reject, oldinstance, accept } type;
         prop_t n_a;
         string v_a;
 
-        MEMBERS(oldinstance, accept, n_a, v_a)
+        MEMBERS(type, n_a, v_a)
     };
     using node_t = string;
-    using nodes_t = vector<node_t>;
+    using nodes_t = std::vector<node_t>;
     using value_t = string;
 
     REMOTE_PROCEDURE_BASE(0x11000);
@@ -33,8 +30,6 @@ namespace paxos_protocol {
     REMOTE_PROCEDURE(2, acceptreq, (bool &, node_t, unsigned, prop_t, value_t));
     REMOTE_PROCEDURE(3, decidereq, (int &, node_t, unsigned, value_t));
     REMOTE_PROCEDURE(4, heartbeat, (int &, string, unsigned));
-};
-
-MARSHALLABLE_STRUCT(paxos_protocol::prepareres)
+}
 
 #endif