X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1b2ab8e6d556a8ed30d4feadc72263b3f4c86665..43d5190f7771063a5377e087b853421ceefae809:/include/stg/admin_conf.h?ds=sidebyside diff --git a/include/stg/admin_conf.h b/include/stg/admin_conf.h index 8b1a988e..88d944bf 100644 --- a/include/stg/admin_conf.h +++ b/include/stg/admin_conf.h @@ -7,11 +7,12 @@ #ifndef ADMIN_CONF_H #define ADMIN_CONF_H -#include "os_int.h" -#include "resetable.h" +#include "stg/resetable.h" #include +#include + #define ADM_LOGIN_LEN (32) #define ADM_PASSWD_LEN (32) //----------------------------------------------------------------------------- @@ -28,7 +29,7 @@ struct PRIV serviceChg(0), corpChg(0) {} - PRIV(uint32_t p) + explicit PRIV(uint32_t p) : userStat((p & 0x00000003) >> 0x00), userConf((p & 0x0000000C) >> 0x02), userCash((p & 0x00000030) >> 0x04), @@ -61,11 +62,6 @@ struct ADMIN_CONF login(), password("* NO PASSWORD *") {} - ADMIN_CONF(const ADMIN_CONF & rvalue) - : priv(rvalue.priv), - login(rvalue.login), - password(rvalue.password) - {} ADMIN_CONF(const PRIV & pr, const std::string & l, const std::string & p) : priv(pr), login(l), @@ -78,11 +74,7 @@ struct ADMIN_CONF //----------------------------------------------------------------------------- struct ADMIN_CONF_RES { - ADMIN_CONF_RES(const ADMIN_CONF & conf) - : priv(conf.priv), - login(conf.login), - password(conf.password) - {} + ADMIN_CONF_RES() {} ADMIN_CONF_RES(const ADMIN_CONF_RES & rhs) : priv(rhs.priv), login(rhs.login),