Revert "Merge remote-tracking branch 'origin/master' into ticket37"

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

diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index bca3c148e1892f1e0306c2683a3aec8cbb6b81e7..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++)
         {
 {
     for (int i = 0; i < DIR_NUM; i++)
         {

-        sessionUpload[i].reset();
-        sessionDownload[i].reset();
-        monthUpload[i].reset();
-        monthDownload[i].reset();
+        u[i].reset();
+        d[i].reset();

         }
 
     for (int i = 0; i < USERDATA_NUM; i++)
         }
 
     for (int i = 0; i < USERDATA_NUM; i++)

-        userData[i].reset();
+        ud[i].reset();

 }
 
 RESETABLE<string>   server;
 }
 
 RESETABLE<string>   server;


@@ -90,13 +88,10 @@ RESETABLE<bool>     disableDetailStat;
 RESETABLE<bool>     alwaysOnline;
 RESETABLE<double>   prepaidTraff;
 
 RESETABLE<bool>     alwaysOnline;
 RESETABLE<double>   prepaidTraff;
 

-RESETABLE<int64_t>  sessionUpload[DIR_NUM];
-RESETABLE<int64_t>  sessionDownload[DIR_NUM];
+RESETABLE<int64_t>  u[DIR_NUM];
+RESETABLE<int64_t>  d[DIR_NUM];

 
 

-RESETABLE<int64_t>  monthUpload[DIR_NUM];
-RESETABLE<int64_t>  monthDownload[DIR_NUM];
-
-RESETABLE<string>   userData[USERDATA_NUM];
+RESETABLE<string>   ud[USERDATA_NUM];

 
 RESETABLE<string>   note;
 RESETABLE<string>   name;
 
 RESETABLE<string>   note;
 RESETABLE<string>   name;