Rolled handle infrastructure into rpcc.

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

diff --git a/paxos_protocol.h b/paxos_protocol.h
index 30a3d2c..8f8f816 100644 (file)
--- a/paxos_protocol.h
+++ b/paxos_protocol.h
@@ -12,8 +12,6 @@ struct prop_t {
     LEXICOGRAPHIC_COMPARISON(prop_t)
 };
 
     LEXICOGRAPHIC_COMPARISON(prop_t)
 };
 

-MARSHALLABLE_STRUCT(prop_t)
-

 namespace paxos_protocol {
     enum status : rpc_protocol::status { OK, ERR };
     struct prepareres {
 namespace paxos_protocol {
     enum status : rpc_protocol::status { OK, ERR };
     struct prepareres {

@@ -25,7 +23,7 @@ namespace paxos_protocol {
         MEMBERS(oldinstance, accept, n_a, v_a)
     };
     using node_t = string;
         MEMBERS(oldinstance, accept, 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);
     using value_t = string;
 
     REMOTE_PROCEDURE_BASE(0x11000);

@@ -35,6 +33,4 @@ namespace paxos_protocol {
     REMOTE_PROCEDURE(4, heartbeat, (int &, string, unsigned));
 }
 
     REMOTE_PROCEDURE(4, heartbeat, (int &, string, unsigned));
 }
 

-MARSHALLABLE_STRUCT(paxos_protocol::prepareres)
-

 #endif
 #endif