Type cleanups

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

diff --git a/config.h b/config.h
index f3fe216..fcf1566 100644 (file)
--- a/config.h
+++ b/config.h
@@ -9,7 +9,7 @@
 class config_view_change {
     public:
         virtual void commit_change(unsigned view_id) = 0;
 class config_view_change {
     public:
         virtual void commit_change(unsigned view_id) = 0;

-        virtual ~config_view_change() {};
+        virtual ~config_view_change() {}

 };
 
 class config : public paxos_change {
 };
 
 class config : public paxos_change {

@@ -26,9 +26,9 @@ class config : public paxos_change {
         paxos_protocol::status heartbeat(int &r, std::string m, unsigned instance);
         std::string value(const std::vector<std::string> &mems) const;
         void members(const std::string &v, std::vector<std::string> &m) const;
         paxos_protocol::status heartbeat(int &r, std::string m, unsigned instance);
         std::string value(const std::vector<std::string> &mems) const;
         void members(const std::string &v, std::vector<std::string> &m) const;

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

         bool remove(const std::string &);
         bool remove(const std::string &);

-        void reconstruct();
+        void reconstruct(lock &cfg_mutex_lock);

         typedef enum {
             OK,        // response and same view #
             VIEWERR,   // response but different view #
         typedef enum {
             OK,        // response and same view #
             VIEWERR,   // response but different view #

@@ -40,8 +40,8 @@ class config : public paxos_change {
                const std::string &_me,
                config_view_change *_vc);
         unsigned view_id() { return my_view_id; }
                const std::string &_me,
                config_view_change *_vc);
         unsigned view_id() { return my_view_id; }

-        const std::string &myaddr() const { return me; };
-        std::string dump() { return paxos_acceptor->dump(); };
+        const std::string &myaddr() const { return me; }
+        std::string dump() { return paxos_acceptor->dump(); }

         void get_view(unsigned instance, std::vector<std::string> &m);
         void restore(const std::string &s);
         bool add(const std::string &, unsigned view_id);
         void get_view(unsigned instance, std::vector<std::string> &m);
         void restore(const std::string &s);
         bool add(const std::string &, unsigned view_id);