X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/4e881433f37417ccbda89c09ffdf936855d462d4..ab6c1548ac2b1907bca92c8ce43e919c1a649a6f:/paxos_protocol.h diff --git a/paxos_protocol.h b/paxos_protocol.h index c61e2eb..8f8f816 100644 --- a/paxos_protocol.h +++ b/paxos_protocol.h @@ -12,8 +12,6 @@ struct prop_t { LEXICOGRAPHIC_COMPARISON(prop_t) }; -MARSHALLABLE_STRUCT(prop_t) - 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; - using nodes_t = vector; + using nodes_t = std::vector; using value_t = string; REMOTE_PROCEDURE_BASE(0x11000); @@ -33,8 +31,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