Got rid of most using directives. Ported tests to python.

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

diff --git a/rsm.h b/rsm.h
index bf2f221..dfbb25c 100644 (file)
--- a/rsm.h
+++ b/rsm.h
@@ -18,7 +18,7 @@ class rsm_state_transfer {
 
 class rsm : public config_view_change {
     protected:
 
 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;
         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
         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;
 
         // For testing purposes
         unique_ptr<rpcs> testsvr;

@@ -39,7 +39,7 @@ class rsm : public config_view_change {
         bool dopartition = false;
         bool breakpoints[2] = {};
 
         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);
         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);
 
         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);
         cond recovery_cond, sync_cond;
 
         void execute(rpc_protocol::proc_id_t procno, const string & req, string & r);