X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5fd8cc8409d0efadc07dfe8d6774ad9ff477663d..be7cf844f59fa483423724e8e4b5e663e5b88ddd:/lock_protocol.h

diff --git a/lock_protocol.h b/lock_protocol.h
index 60df0ef..1e45ddc 100644
--- a/lock_protocol.h
+++ b/lock_protocol.h
@@ -3,28 +3,27 @@
 #ifndef lock_protocol_h
 #define lock_protocol_h
 
-#include "rpc.h"
+#include "types.h"
+#include "rpc/rpc.h"
 
 class lock_protocol {
     public:
-        enum xxstatus { OK, RETRY, RPCERR, NOENT, IOERR };
-        typedef int status;
-        typedef unsigned long long lockid_t;
-        typedef unsigned long long xid_t;
-        enum rpc_numbers {
+        enum status : status_t { OK, RETRY, RPCERR, NOENT, IOERR };
+        using lockid_t = string;
+        using xid_t = uint64_t;
+        enum rpc_numbers : proc_t {
             acquire = 0x7001,
             release,
-            stat
+            stat,
         };
 };
 
 class rlock_protocol {
     public:
-        enum xxstatus { OK, RPCERR };
-        typedef int status;
-        enum rpc_numbers {
+        enum status : status_t { OK, RPCERR };
+        enum rpc_numbers : proc_t {
             revoke = 0x8001,
-            retry = 0x8002
+            retry,
         };
 };
 #endif