Merge remote-tracking branch 'origin/ticket'

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

diff --git a/include/stg/admin_conf.h b/include/stg/admin_conf.h
index d906a6540217acd1de25397596bd45c2d0cc9f21..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
 
-#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,8 +79,7 @@ struct ADMIN_CONF
 //-----------------------------------------------------------------------------
 struct ADMIN_CONF_RES
 {
-    ADMIN_CONF_RES()
-    {}
+    ADMIN_CONF_RES() {}
     ADMIN_CONF_RES(const ADMIN_CONF_RES & rhs)
         : priv(rhs.priv),
           login(rhs.login),
@@ -90,6 +90,7 @@ struct ADMIN_CONF_RES
         priv = rhs.priv;
         login = rhs.login;
         password = rhs.password;
+        return *this;
     }
     RESETABLE<PRIV> priv;
     RESETABLE<std::string> login;