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

[stg.git] / projects / sgconf / request.h

diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index 5ce4d093caa05c566d85d8f9819b4270dc44129a..6122212732aa5206359a6eb8342c717de401c61a 100644 (file)
--- a/projects/sgconf/request.h
+++ b/projects/sgconf/request.h
@@ -54,14 +54,12 @@ REQUEST()
 {
     for (int i = 0; i < DIR_NUM; i++)
         {
-        sessionUp[i].reset();
-        sessionDown[i].reset();
-        monthUp[i].reset();
-        monthDown[i].reset();
+        u[i].reset();
+        d[i].reset();
         }
 
     for (int i = 0; i < USERDATA_NUM; i++)
-        userData[i].reset();
+        ud[i].reset();
 }
 
 RESETABLE<string>   server;
@@ -90,13 +88,10 @@ RESETABLE<bool>     disableDetailStat;
 RESETABLE<bool>     alwaysOnline;
 RESETABLE<double>   prepaidTraff;
 
-RESETABLE<int64_t>  sessionUp[DIR_NUM];
-RESETABLE<int64_t>  sessionDown[DIR_NUM];
+RESETABLE<int64_t>  u[DIR_NUM];
+RESETABLE<int64_t>  d[DIR_NUM];
 
-RESETABLE<int64_t>  monthUp[DIR_NUM];
-RESETABLE<int64_t>  monthDown[DIR_NUM];
-
-RESETABLE<string>   userData[USERDATA_NUM];
+RESETABLE<string>   ud[USERDATA_NUM];
 
 RESETABLE<string>   note;
 RESETABLE<string>   name;