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

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

diff --git a/config.h b/config.h
index 26a612d..d2b33ba 100644 (file)
--- a/config.h
+++ b/config.h
@@ -17,11 +17,11 @@ class config : public paxos_change {
         string me;
         config_view_change *vc;
         proposer_acceptor paxos;
         string me;
         config_view_change *vc;
         proposer_acceptor paxos;

-        vector<string> mems;
-        mutex cfg_mutex;
+        std::vector<string> mems;
+        std::mutex cfg_mutex;

         cond config_cond;
         paxos_protocol::status heartbeat(int & r, string m, unsigned instance);
         cond config_cond;
         paxos_protocol::status heartbeat(int & r, string m, unsigned instance);

-        void get_view(unsigned instance, vector<string> & m, lock & cfg_mutex_lock);
+        void get_view(unsigned instance, std::vector<string> & m, lock & cfg_mutex_lock);

         bool remove(const string &, lock & cfg_mutex_lock);
         void reconstruct(lock & cfg_mutex_lock);
         typedef enum {
         bool remove(const string &, lock & cfg_mutex_lock);
         void reconstruct(lock & cfg_mutex_lock);
         typedef enum {

@@ -35,7 +35,7 @@ class config : public paxos_change {
         unsigned view_id() { return my_view_id; }
         const string & myaddr() const { return me; }
         string dump() { return paxos.dump(); }
         unsigned view_id() { return my_view_id; }
         const string & myaddr() const { return me; }
         string dump() { return paxos.dump(); }

-        void get_view(unsigned instance, vector<string> & m);
+        void get_view(unsigned instance, std::vector<string> & m);

         void restore(const string & s);
         bool add(const string &, unsigned view_id);
         bool ismember(const string & m, unsigned view_id);
         void restore(const string & s);
         bool add(const string &, unsigned view_id);
         bool ismember(const string & m, unsigned view_id);