Merge remote-tracking branch 'origin/stg-2.409' into ticket37

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

diff --git a/include/stg/admin_conf.h b/include/stg/admin_conf.h
index 8b1a988e1877ff79c77e73bfd404b67e22710583..f88ab0c8035bef250f5a9d7800bd8c5e03ccbe02 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
 
-#include "os_int.h"
-#include "resetable.h"
+#include "stg/resetable.h"
 
 #include <string>
 
+#include "os_int.h"
+
 #define ADM_LOGIN_LEN   (32)
 #define ADM_PASSWD_LEN  (32)
 //-----------------------------------------------------------------------------
@@ -78,10 +79,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),