All sleep calls via std::this_thread

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

diff --git a/rsm_protocol.h b/rsm_protocol.h
index d64c0af..5a5b7dd 100644 (file)
--- a/rsm_protocol.h
+++ b/rsm_protocol.h
@@ -8,8 +8,8 @@ namespace rsm_client_protocol {
     enum status : rpc_protocol::status {OK, ERR, NOTPRIMARY, BUSY};
     REMOTE_PROCEDURE_BASE(0x9000);
     REMOTE_PROCEDURE(1, invoke, (string &, rpc_protocol::proc_id_t, string));
-    REMOTE_PROCEDURE(2, members, (vector<string> &, int));
-};
+    REMOTE_PROCEDURE(2, members, (std::vector<string> &, int));
+}
 
 struct viewstamp {
     unsigned int vid;
@@ -20,8 +20,6 @@ struct viewstamp {
     LEXICOGRAPHIC_COMPARISON(viewstamp)
 };
 
-MARSHALLABLE(viewstamp)
-
 namespace rsm_protocol {
     enum status : rpc_protocol::status { OK, ERR, BUSY};
 
@@ -37,15 +35,13 @@ namespace rsm_protocol {
     REMOTE_PROCEDURE(2, transferreq, (transferres &, string, viewstamp, unsigned));
     REMOTE_PROCEDURE(3, transferdonereq, (int &, string, unsigned));
     REMOTE_PROCEDURE(4, joinreq, (string &, string, viewstamp));
-};
-
-MARSHALLABLE(rsm_protocol::transferres)
+}
 
 namespace rsm_test_protocol {
     enum status : rpc_protocol::status {OK, ERR};
     REMOTE_PROCEDURE_BASE(0x12000);
     REMOTE_PROCEDURE(1, net_repair, (status &, int));
     REMOTE_PROCEDURE(2, breakpoint, (status &, int));
-};
+}
 
 #endif