Merge branch 'stg-2.409'

[stg.git] / tests / testadmin.h

diff --git a/tests/testadmin.h b/tests/testadmin.h
index b6b871f5af529dc3d8c6b6a3389c62b7803fc613..f10df54e3ab067596fb96ae38d6f5be9b3f4436a 100644 (file)
--- a/tests/testadmin.h
+++ b/tests/testadmin.h
@@ -5,19 +5,12 @@
 
 class TEST_ADMIN : public ADMIN {
     public:
 
 class TEST_ADMIN : public ADMIN {
     public:

-        TEST_ADMIN() : priv(0xffFF) {}
-
-        ADMIN & operator=(const ADMIN &) { return *this; }
-        ADMIN & operator=(const ADMIN_CONF &) { return *this; }
-        bool    operator==(const ADMIN & /*rhs*/) const { return true; }
-        bool    operator!=(const ADMIN & /*rhs*/) const { return false; }
-        bool    operator<(const ADMIN & /*rhs*/) const { return true; }
-        bool    operator<=(const ADMIN & /*rhs*/) const { return true; }
+        TEST_ADMIN() : priv(0xffFF), ip(0) {}

 
         const std::string & GetPassword() const { return password; }
         const std::string & GetLogin() const { return login; }
         PRIV const *        GetPriv() const { return &priv; }
 
         const std::string & GetPassword() const { return password; }
         const std::string & GetLogin() const { return login; }
         PRIV const *        GetPriv() const { return &priv; }

-        uint16_t            GetPrivAsInt() const { return priv.ToInt(); }
+        uint32_t            GetPrivAsInt() const { return priv.ToInt(); }

         const ADMIN_CONF &  GetConf() const { return conf; }
         uint32_t            GetIP() const { return ip; }
         std::string         GetIPStr() const { return inet_ntostring(ip); }
         const ADMIN_CONF &  GetConf() const { return conf; }
         uint32_t            GetIP() const { return ip; }
         std::string         GetIPStr() const { return inet_ntostring(ip); }