Ticket. The stgTime argument added in TariffChangeIsAllowed()

[stg.git] / include / stg / admin_conf.h

diff --git a/include/stg/admin_conf.h b/include/stg/admin_conf.h
index 7fbf44408c72ea45807a8b8f5ae5c1d942df6f6e..6e073d6fe972765609c25f7c914e60cb4ba36f49 100644 (file)
--- a/include/stg/admin_conf.h
+++ b/include/stg/admin_conf.h
@@ -7,11 +7,12 @@
 #ifndef ADMIN_CONF_H
 #define ADMIN_CONF_H
 
 #ifndef ADMIN_CONF_H
 #define ADMIN_CONF_H
 

-#include "os_int.h"
-#include "resetable.h"
+#include "stg/resetable.h"

 
 #include <string>
 
 
 #include <string>
 

+#include "os_int.h"
+

 #define ADM_LOGIN_LEN   (32)
 #define ADM_PASSWD_LEN  (32)
 //-----------------------------------------------------------------------------
 #define ADM_LOGIN_LEN   (32)
 #define ADM_PASSWD_LEN  (32)
 //-----------------------------------------------------------------------------


@@ -79,11 +80,6 @@ struct ADMIN_CONF
 struct ADMIN_CONF_RES
 {
     ADMIN_CONF_RES() {}
 struct ADMIN_CONF_RES
 {
     ADMIN_CONF_RES() {}

-    ADMIN_CONF_RES(const ADMIN_CONF & conf)
-        : priv(conf.priv),
-          login(conf.login),
-          password(conf.password)
-    {}

     ADMIN_CONF_RES(const ADMIN_CONF_RES & rhs)
         : priv(rhs.priv),
           login(rhs.login),
     ADMIN_CONF_RES(const ADMIN_CONF_RES & rhs)
         : priv(rhs.priv),
           login(rhs.login),