Clean-ups to types.

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

diff --git a/lock_client.h b/lock_client.h
index 36ee3a2..5db2cbf 100644 (file)
--- a/lock_client.h
+++ b/lock_client.h
@@ -45,8 +45,8 @@ class lock_client {
         rpcc *cl;
         thread releaser_thread;
         rsm_client *rsmc;
         rpcc *cl;
         thread releaser_thread;
         rsm_client *rsmc;

-        class lock_release_user *lu;
-        unsigned int rlock_port;
+        lock_release_user *lu;
+        in_port_t rlock_port;

         string hostname;
         string id;
         mutex xid_mutex;
         string hostname;
         string id;
         mutex xid_mutex;

@@ -56,8 +56,8 @@ class lock_client {
         lock_map lock_table;
         lock_state &get_lock_state(lock_protocol::lockid_t lid);
     public:
         lock_map lock_table;
         lock_state &get_lock_state(lock_protocol::lockid_t lid);
     public:

-        static unsigned int last_port;
-        lock_client(string xdst, class lock_release_user *l = 0);
+        static in_port_t last_port;
+        lock_client(string xdst, lock_release_user *l = 0);

         ~lock_client() {}
         lock_protocol::status acquire(lock_protocol::lockid_t);
         lock_protocol::status release(lock_protocol::lockid_t);
         ~lock_client() {}
         lock_protocol::status acquire(lock_protocol::lockid_t);
         lock_protocol::status release(lock_protocol::lockid_t);