Rewrote threaded log code to be more idiomatic.

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

diff --git a/paxos_protocol.h b/paxos_protocol.h
index 1f5fd3e..30a3d2c 100644 (file)
--- a/paxos_protocol.h
+++ b/paxos_protocol.h
@@ -12,7 +12,7 @@ struct prop_t {
     LEXICOGRAPHIC_COMPARISON(prop_t)
 };
 
-MARSHALLABLE(prop_t)
+MARSHALLABLE_STRUCT(prop_t)
 
 namespace paxos_protocol {
     enum status : rpc_protocol::status { OK, ERR };
@@ -33,8 +33,8 @@ 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(paxos_protocol::prepareres)
+MARSHALLABLE_STRUCT(paxos_protocol::prepareres)
 
 #endif