Got rid of most using directives. Ported tests to python.

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

diff --git a/lock_client.h b/lock_client.h
index 31bf905..5cdb26e 100644 (file)
--- a/lock_client.h
+++ b/lock_client.h
@@ -26,17 +26,17 @@ public:
         acquiring,
         releasing
     } state = none;
         acquiring,
         releasing
     } state = none;

-    thread::id held_by;
-    list<thread::id> wanted_by;
-    mutex m;
-    map<thread::id, cond> c;
+    std::thread::id held_by;
+    std::list<thread::id> wanted_by;
+    std::mutex m;
+    std::map<thread::id, cond> c;

     lock_protocol::xid_t xid;
     void wait(lock & mutex_lock);
     void signal();
     void signal(thread::id who);
 };
 
     lock_protocol::xid_t xid;
     void wait(lock & mutex_lock);
     void signal();
     void signal(thread::id who);
 };
 

-typedef map<lock_protocol::lockid_t, lock_state> lock_map;
+typedef std::map<lock_protocol::lockid_t, lock_state> lock_map;

 
 // Clients that caches locks.  The server can revoke locks using
 // lock_revoke_server.
 
 // Clients that caches locks.  The server can revoke locks using
 // lock_revoke_server.

@@ -50,10 +50,10 @@ class lock_client {
         in_port_t rlock_port;
         string hostname;
         string id;
         in_port_t rlock_port;
         string hostname;
         string id;

-        mutex xid_mutex;
+        std::mutex xid_mutex;

         lock_protocol::xid_t next_xid;
         fifo<lock_protocol::lockid_t> release_fifo;
         lock_protocol::xid_t next_xid;
         fifo<lock_protocol::lockid_t> release_fifo;

-        mutex lock_table_lock;
+        std::mutex lock_table_lock;

         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: