Working on g++ compatibility

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

diff --git a/lock_server.h b/lock_server.h
index 6ba4902..d3ec580 100644 (file)
--- a/lock_server.h
+++ b/lock_server.h
@@ -22,7 +22,7 @@ public:
     MEMBERS(held, held_by, wanted_by)
 };
 
-MARSHALLABLE(lock_state)
+MARSHALLABLE_STRUCT(lock_state)
 
 typedef map<lock_protocol::lockid_t, lock_state> lock_map;
 
@@ -37,8 +37,8 @@ class lock_server : public rsm_state_transfer {
         rsm *rsm_;
     public:
         lock_server(rsm *r = 0);
-        void revoker();
-        void retryer();
+        void revoker NORETURN ();
+        void retryer NORETURN ();
         string marshal_state();
         void unmarshal_state(const string & state);
         lock_protocol::status acquire(int &, lock_protocol::lockid_t, const callback_t & id, lock_protocol::xid_t);