More clean-ups

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

diff --git a/config.h b/config.h
index cd276fb..f3fe216 100644 (file)
--- a/config.h
+++ b/config.h
@@ -23,10 +23,7 @@ class config : public paxos_change {
         std::vector<std::string> mems;
         mutex cfg_mutex;
         std::condition_variable config_cond;
         std::vector<std::string> mems;
         mutex cfg_mutex;
         std::condition_variable config_cond;

-        paxos_protocol::status heartbeat(
-                std::string m,
-                unsigned instance,
-                int &r);
+        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);
         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);