Working on g++ compatibility

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

diff --git a/rsm_protocol.h b/rsm_protocol.h
index d64c0af..9cd60bd 100644 (file)
--- a/rsm_protocol.h
+++ b/rsm_protocol.h
@@ -20,7 +20,7 @@ struct viewstamp {
     LEXICOGRAPHIC_COMPARISON(viewstamp)
 };
 
     LEXICOGRAPHIC_COMPARISON(viewstamp)
 };
 

-MARSHALLABLE(viewstamp)
+MARSHALLABLE_STRUCT(viewstamp)

 
 namespace rsm_protocol {
     enum status : rpc_protocol::status { OK, ERR, BUSY};
 
 namespace rsm_protocol {
     enum status : rpc_protocol::status { OK, ERR, BUSY};

@@ -39,7 +39,7 @@ namespace rsm_protocol {
     REMOTE_PROCEDURE(4, joinreq, (string &, string, viewstamp));
 };
 
     REMOTE_PROCEDURE(4, joinreq, (string &, string, viewstamp));
 };
 

-MARSHALLABLE(rsm_protocol::transferres)
+MARSHALLABLE_STRUCT(rsm_protocol::transferres)

 
 namespace rsm_test_protocol {
     enum status : rpc_protocol::status {OK, ERR};
 
 namespace rsm_test_protocol {
     enum status : rpc_protocol::status {OK, ERR};