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 28ceab661feb5d7aa95a600d24c9530a50081ab1..6e073d6fe972765609c25f7c914e60cb4ba36f49 100644 (file)
--- a/include/stg/admin_conf.h
+++ b/include/stg/admin_conf.h
@@ -7,6 +7,8 @@
 #ifndef ADMIN_CONF_H
 #define ADMIN_CONF_H
 
 #ifndef ADMIN_CONF_H
 #define ADMIN_CONF_H
 

+#include "stg/resetable.h"
+

 #include <string>
 
 #include "os_int.h"
 #include <string>
 
 #include "os_int.h"


@@ -77,8 +79,7 @@ struct ADMIN_CONF
 //-----------------------------------------------------------------------------
 struct ADMIN_CONF_RES
 {
 //-----------------------------------------------------------------------------
 struct ADMIN_CONF_RES
 {

-    ADMIN_CONF_RES()
-    {}
+    ADMIN_CONF_RES() {}

     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),