More clean-ups and cool template stuff

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

diff --git a/lock_protocol.h b/lock_protocol.h
index 60df0ef..900897a 100644 (file)
--- a/lock_protocol.h
+++ b/lock_protocol.h
@@ -3,15 +3,17 @@
 #ifndef lock_protocol_h
 #define lock_protocol_h
 
-#include "rpc.h"
+#include "rpc/rpc.h"
+#include <string>
+
+using std::string;
 
 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
@@ -20,9 +22,8 @@ class lock_protocol {
 
 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
         };