Fix funtests to work with the new build system.

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

diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h
index 465cfef4c7e4e2a8cc70fd88322a0708711c0698..d48682d6e7a0797d8906555618e8fe7a387fb90b 100644 (file)
--- a/include/stg/user_conf.h
+++ b/include/stg/user_conf.h
@@ -9,10 +9,10 @@
 
 #include <string>
 #include <vector>
+#include <cstdint>
 #include "const.h"
 #include "user_ips.h"
 #include "resetable.h"
-#include "os_int.h"
 
 //-----------------------------------------------------------------------------
 struct USER_CONF
@@ -39,7 +39,7 @@ struct USER_CONF
     std::string              note;
     std::string              realName;
     std::string              corp;
-    std::vector<std::string> service;
+    std::vector<std::string> services;
     std::string              group;
     double                   credit;
     std::string              nextTariff;
@@ -50,6 +50,9 @@ struct USER_CONF
 //-----------------------------------------------------------------------------
 struct USER_CONF_RES
 {
+    USER_CONF_RES()
+        : userdata(USERDATA_NUM)
+    {}
     USER_CONF_RES & operator=(const USER_CONF & uc)
     {
         userdata.resize(USERDATA_NUM);
@@ -64,13 +67,12 @@ struct USER_CONF_RES
         email        = uc.email;
         note         = uc.note;
         realName     = uc.realName;
+        corp         = uc.corp;
         group        = uc.group;
         credit       = uc.credit;
         nextTariff   = uc.nextTariff;
-        for (int i = 0; i < USERDATA_NUM; i++)
-            {
-            userdata[i]  = uc.userdata[i];
-            }
+        for (size_t i = 0; i < USERDATA_NUM; i++) userdata[i]  = uc.userdata[i];
+        services     = uc.services;
         creditExpire = uc.creditExpire;
         ips          = uc.ips;
         return *this;
@@ -89,13 +91,15 @@ struct USER_CONF_RES
         uc.email        = email.data();
         uc.note         = note.data();
         uc.realName     = realName.data();
+        uc.corp         = corp.data();
         uc.group        = group.data();
         uc.credit       = credit.data();
         uc.nextTariff   = nextTariff.data();
-        for (int i = 0; i < USERDATA_NUM; i++)
+        for (size_t i = 0; i < USERDATA_NUM; i++)
             {
             uc.userdata[i]  = userdata[i].data();
             }
+        uc.services     = services.data();
         uc.creditExpire = creditExpire.data();
         uc.ips          = ips.data();
         return uc;
@@ -113,10 +117,12 @@ struct USER_CONF_RES
     RESETABLE<std::string>               email;
     RESETABLE<std::string>               note;
     RESETABLE<std::string>               realName;
+    RESETABLE<std::string>               corp;
     RESETABLE<std::string>               group;
     RESETABLE<double>                    credit;
     RESETABLE<std::string>               nextTariff;
     std::vector<RESETABLE<std::string> > userdata;
+    RESETABLE<std::vector<std::string> > services;
     RESETABLE<time_t>                    creditExpire;
     RESETABLE<USER_IPS>                  ips;
 };