So many changes. Broken.

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

diff --git a/config.h b/include/config.h
similarity index 83%
rename from config.h
rename to include/config.h
index 8d0c836..ce8990d 100644 (file)
--- a/config.h
+++ b/include/config.h
@@ -1,8 +1,8 @@
 #ifndef config_h
 #define config_h
 
-#include "types.h"
-#include "paxos.h"
+#include "include/types.h"
+#include "include/paxos.h"
 
 class config_view_change {
     public:
@@ -20,8 +20,8 @@ class config : public paxos_change {
         std::vector<string> mems;
         std::mutex cfg_mutex;
         cond config_cond;
-        paxos_protocol::status heartbeat(int & r, string m, unsigned instance);
-        void get_view(unsigned instance, std::vector<string> & m, lock & cfg_mutex_lock);
+        paxos_protocol::status heartbeat(paxos_protocol::view_t & r, string m, unsigned instance);
+        std::vector<string> get_view(unsigned instance, lock & cfg_mutex_lock);
         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(); }
-        void get_view(unsigned instance, std::vector<string> & m);
+        std::vector<string> get_view(unsigned instance);
         void restore(const string & s);
         bool add(const string &, unsigned view_id);
         bool ismember(const string & m, unsigned view_id);