Working on g++ compatibility

[invirt/third/libt4.git] / rpc / marshall.h

diff --git a/rpc/marshall.h b/rpc/marshall.h
index 6412612..6e0c94a 100644 (file)
--- a/rpc/marshall.h
+++ b/rpc/marshall.h
@@ -149,13 +149,13 @@ operator>>(unmarshall & u, tuple<Args &...> && t) {
 //
 
 // Implements struct marshalling via tuple marshalling of members.
 //
 
 // Implements struct marshalling via tuple marshalling of members.

-#define MARSHALLABLE(_c_) \
+#define MARSHALLABLE_STRUCT(_c_) \

 inline unmarshall & operator>>(unmarshall &u, _c_ &a) { return u >> a._tuple_(); } \
 inline marshall & operator<<(marshall &m, const _c_ a) { return m << a._tuple_(); }
 
 // our first two marshallable structs...
 inline unmarshall & operator>>(unmarshall &u, _c_ &a) { return u >> a._tuple_(); } \
 inline marshall & operator<<(marshall &m, const _c_ a) { return m << a._tuple_(); }
 
 // our first two marshallable structs...

-MARSHALLABLE(rpc_protocol::request_header)
-MARSHALLABLE(rpc_protocol::reply_header)
+MARSHALLABLE_STRUCT(rpc_protocol::request_header)
+MARSHALLABLE_STRUCT(rpc_protocol::reply_header)

 
 //
 // Marshalling for STL containers
 
 //
 // Marshalling for STL containers