X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/f0dcb6b97d6d40f67698d1f71ac26970f1776f82..06282fd37814c4a9d53bca089b048709b368f5b3:/rsm.h

diff --git a/rsm.h b/rsm.h
index ca03473..dfbb25c 100644
--- a/rsm.h
+++ b/rsm.h
@@ -13,12 +13,12 @@ class rsm_state_transfer {
     public:
         virtual string marshal_state() = 0;
         virtual void unmarshal_state(const string &) = 0;
-        virtual ~rsm_state_transfer() {}
+        virtual ~rsm_state_transfer();
 };
 
 class rsm : public config_view_change {
     protected:
-        map<rpc_protocol::proc_id_t, handler *> procs;
+        std::map<rpc_protocol::proc_id_t, handler *> procs;
         unique_ptr<config> cfg;
         rsm_state_transfer *stf = nullptr;
         rpcs *rsmrpc;
@@ -31,7 +31,7 @@ class rsm : public config_view_change {
         bool inviewchange = true;
         unsigned vid_commit = 0;  // Latest view id that is known to rsm layer
         unsigned vid_insync;  // The view id that this node is synchronizing for
-        vector<string> backups;   // A list of unsynchronized backups
+        std::vector<string> backups;   // A list of unsynchronized backups
 
         // For testing purposes
         unique_ptr<rpcs> testsvr;
@@ -39,7 +39,7 @@ class rsm : public config_view_change {
         bool dopartition = false;
         bool breakpoints[2] = {};
 
-        rsm_client_protocol::status client_members(vector<string> & r, int i);
+        rsm_client_protocol::status client_members(std::vector<string> & r, int i);
         rsm_protocol::status invoke(int &, rpc_protocol::proc_id_t proc, viewstamp vs, const string & mreq);
         rsm_protocol::status transferreq(rsm_protocol::transferres & r, const string & src,
                 viewstamp last, unsigned vid);
@@ -48,7 +48,7 @@ class rsm : public config_view_change {
         rsm_test_protocol::status test_net_repairreq(rsm_test_protocol::status & r, int heal);
         rsm_test_protocol::status breakpointreq(rsm_test_protocol::status & r, int b);
 
-        mutex rsm_mutex, invoke_mutex;
+        std::mutex rsm_mutex, invoke_mutex;
         cond recovery_cond, sync_cond;
 
         void execute(rpc_protocol::proc_id_t procno, const string & req, string & r);