Merge

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Common/HostInfo.h b/src/Common/HostInfo.h
index db7f5d1..c036b5c 100644
--- a/src/Common/HostInfo.h
+++ b/src/Common/HostInfo.h
@@ -27,7 +27,7 @@ namespace Common {
 
 class HostInfo {
   public:
-    enum Status {
+    enum State {
       INACTIVE, RUNNING
     };
 
@@ -35,10 +35,10 @@ class HostInfo {
     std::string name;
     std::string ip;
 
-    Status status;
+    State state;
 
   public:
-    HostInfo(const std::string& name0 = std::string()) : name(name0), status(INACTIVE) {}
+    HostInfo(const std::string& name0 = std::string()) : name(name0), state(INACTIVE) {}
 
     void setName(const std::string &newName) {name = newName;}
     const std::string& getName() const {return name;}
@@ -46,8 +46,8 @@ class HostInfo {
     void setIP(const std::string& newIp) {ip = newIp;}
     const std::string& getIP() const {return ip;}
 
-    void setStatus(Status newStatus) {status = newStatus;}
-    Status getStatus() const {return status;}
+    void setState(State newState) {state = newState;}
+    State getState() const {return state;}
 };
 
 }