Allowed to build on Darwin.

[stg.git] / projects / stargazer / admin_impl.h

diff --git a/projects/stargazer/admin_impl.h b/projects/stargazer/admin_impl.h
index 8dd8a898893acb85aedd81f99232e2e46b5ceec0..9a2b9781242a62eec4a06e8d82b776fec6a2732b 100644 (file)
--- a/projects/stargazer/admin_impl.h
+++ b/projects/stargazer/admin_impl.h
@@ -33,36 +33,36 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "admin.h"
-#include "os_int.h"
-#include "admin_conf.h"
-#include "stg_logger.h"
+#include "stg/admin.h"
+#include "stg/os_int.h"
+#include "stg/admin_conf.h"
+#include "stg/logger.h"

 
 class ADMIN_IMPL : public ADMIN {
 public:
       ADMIN_IMPL();
       ADMIN_IMPL(const ADMIN_CONF & ac);
       ADMIN_IMPL(const PRIV & priv,
 
 class ADMIN_IMPL : public ADMIN {
 public:
       ADMIN_IMPL();
       ADMIN_IMPL(const ADMIN_CONF & ac);
       ADMIN_IMPL(const PRIV & priv,

-            const std::string & login,
-            const std::string & password);
-      virtual ~ADMIN_IMPL() {};
+                 const std::string & login,
+                 const std::string & password);
+      virtual ~ADMIN_IMPL() {}

 
 

-      ADMIN & operator=(const ADMIN &);
-      ADMIN & operator=(const ADMIN_CONF &);
-      bool         operator==(const ADMIN & rhs) const;
-      bool         operator!=(const ADMIN & rhs) const;
-      bool         operator<(const ADMIN & rhs) const;
-      bool         operator<=(const ADMIN & rhs) const;
+      ADMIN_IMPL & operator=(const ADMIN_IMPL &);
+      ADMIN_IMPL & operator=(const ADMIN_CONF &);
+      bool         operator==(const ADMIN_IMPL & rhs) const;
+      bool         operator!=(const ADMIN_IMPL & rhs) const;
+      bool         operator<(const ADMIN_IMPL & rhs) const;
+      bool         operator<=(const ADMIN_IMPL & rhs) const;

 
 

-      const std::string & GetPassword() const { return conf.password; };
-      const std::string & GetLogin() const { return conf.login; };
-      PRIV const *        GetPriv() const { return &conf.priv; };
-      uint16_t            GetPrivAsInt() const { return conf.priv.ToInt(); };
-      const ADMIN_CONF &  GetConf() const { return conf; };
+      const std::string & GetPassword() const { return conf.password; }
+      const std::string & GetLogin() const { return conf.login; }
+      PRIV const *        GetPriv() const { return &conf.priv; }
+      uint32_t            GetPrivAsInt() const { return conf.priv.ToInt(); }
+      const ADMIN_CONF &  GetConf() const { return conf; }

       void                Print() const;
       void                Print() const;

-      uint32_t            GetIP() const { return ip; };
+      uint32_t            GetIP() const { return ip; }

       std::string         GetIPStr() const;
       std::string         GetIPStr() const;

-      void                SetIP(uint32_t ip) { ADMIN_IMPL::ip = ip; };
+      void                SetIP(uint32_t v) { ip = v; }

       const std::string   GetLogStr() const;
 
 private:
       const std::string   GetLogStr() const;
 
 private: