Working on g++ compatibility

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

diff --git a/lock_server.h b/lock_server.h
index 560167f..d3ec580 100644 (file)
--- a/lock_server.h
+++ b/lock_server.h
@@ -6,7 +6,6 @@
 #include "rsm.h"
 #include "rpc/fifo.h"
 
 #include "rsm.h"
 #include "rpc/fifo.h"
 

-typedef string callback_t;

 typedef pair<callback_t, lock_protocol::xid_t> holder_t;
 
 class lock_state {
 typedef pair<callback_t, lock_protocol::xid_t> holder_t;
 
 class lock_state {

@@ -23,7 +22,7 @@ public:
     MEMBERS(held, held_by, wanted_by)
 };
 
     MEMBERS(held, held_by, wanted_by)
 };
 

-MARSHALLABLE(lock_state)
+MARSHALLABLE_STRUCT(lock_state)

 
 typedef map<lock_protocol::lockid_t, lock_state> lock_map;
 
 
 typedef map<lock_protocol::lockid_t, lock_state> lock_map;
 

@@ -38,13 +37,13 @@ class lock_server : public rsm_state_transfer {
         rsm *rsm_;
     public:
         lock_server(rsm *r = 0);
         rsm *rsm_;
     public:
         lock_server(rsm *r = 0);

-        lock_protocol::status stat(int &, lock_protocol::lockid_t);
-        void revoker();
-        void retryer();
+        void revoker NORETURN ();
+        void retryer NORETURN ();

         string marshal_state();
         string marshal_state();

-        void unmarshal_state(string state);
-        int acquire(int &, lock_protocol::lockid_t, string id, lock_protocol::xid_t);
-        int release(int &, lock_protocol::lockid_t, string id, lock_protocol::xid_t);
+        void unmarshal_state(const string & state);
+        lock_protocol::status acquire(int &, lock_protocol::lockid_t, const callback_t & id, lock_protocol::xid_t);
+        lock_protocol::status release(int &, lock_protocol::lockid_t, const callback_t & id, lock_protocol::xid_t);
+        lock_protocol::status stat(int &, lock_protocol::lockid_t, const callback_t & id);

 };
 
 #endif
 };
 
 #endif