Major clean-ups. Migrating to C++11.

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

diff --git a/lock_server.h b/lock_server.h
index e24e359..f03a717 100644 (file)
--- a/lock_server.h
+++ b/lock_server.h
@@ -7,13 +7,11 @@
 #include <string>
 #include "lock_protocol.h"
 #include "lock_client.h"
 #include <string>
 #include "lock_protocol.h"
 #include "lock_client.h"

-#include "rpc.h"
-#include <pthread.h>
+#include "rpc/rpc.h"

 #include <list>
 #include <map>
 #include <list>
 #include <map>

-#include "mutex.h"

 
 

-using namespace std;
+using std::map;

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