X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5fd8cc8409d0efadc07dfe8d6774ad9ff477663d..a4175b2e216a20b86cc872dea8a08005c60617a5:/rsm.h diff --git a/rsm.h b/rsm.h index c5bf4fc..ec7632d 100644 --- a/rsm.h +++ b/rsm.h @@ -7,7 +7,7 @@ #include #include "rsm_protocol.h" #include "rsm_state_transfer.h" -#include "rpc.h" +#include "rpc/rpc.h" #include #include "config.h" @@ -51,10 +51,10 @@ class rsm : public config_view_change { rsm_test_protocol::status test_net_repairreq(int heal, int &r); rsm_test_protocol::status breakpointreq(int b, int &r); - mutex rsm_mutex; - mutex invoke_mutex; - cond recovery_cond; - cond sync_cond; + std::mutex rsm_mutex; + std::mutex invoke_mutex; + std::condition_variable recovery_cond; + std::condition_variable sync_cond; void execute(int procno, std::string req, std::string &r); rsm_client_protocol::status client_invoke(int procno, std::string req,