X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5fd8cc8409d0efadc07dfe8d6774ad9ff477663d..dfe8486473094c0769fd1922329c3f0dfd8f43c0:/lock_server_cache_rsm.h diff --git a/lock_server_cache_rsm.h b/lock_server_cache_rsm.h index eb86bd0..a765e52 100644 --- a/lock_server_cache_rsm.h +++ b/lock_server_cache_rsm.h @@ -6,13 +6,16 @@ #include #include #include "lock_protocol.h" -#include "rpc.h" -#include "mutex.h" +#include "rpc/rpc.h" #include "rsm_state_transfer.h" #include "rsm.h" #include "rpc/fifo.h" +#include "lock.h" -using namespace std; +using std::string; +using std::pair; +using std::list; +using std::map; typedef string callback; typedef pair holder; @@ -20,11 +23,13 @@ typedef pair holder; class lock_state { public: lock_state(); + lock_state(const lock_state &other); bool held; holder held_by; list wanted_by; map old_requests; mutex m; + lock_state& operator=(const lock_state&); }; typedef map lock_map;