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

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

diff --git a/rsm.h b/rsm.h
index c5bf4fc..ec7632d 100644 (file)
--- a/rsm.h
+++ b/rsm.h
@@ -7,7 +7,7 @@
 #include <vector>
 #include "rsm_protocol.h"
 #include "rsm_state_transfer.h"
 #include <vector>
 #include "rsm_protocol.h"
 #include "rsm_state_transfer.h"

-#include "rpc.h"
+#include "rpc/rpc.h"

 #include <arpa/inet.h>
 #include "config.h"
 
 #include <arpa/inet.h>
 #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);
 
         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,
 
         void execute(int procno, std::string req, std::string &r);
         rsm_client_protocol::status client_invoke(int procno, std::string req,