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

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

diff --git a/include/stg/user_stat.h b/include/stg/user_stat.h
index ff020dc7021195e8d3a921e3b52a72408f0fe6c8..4c06155dfe82e47980a8e60a13341fac9c8be2ab 100644 (file)
--- a/include/stg/user_stat.h
+++ b/include/stg/user_stat.h
@@ -29,8 +29,6 @@
 
 #include <ctime>
 #include <map>
-#include <utility>
-#include <string>
 
 #include "os_int.h"
 #include "resetable.h"
@@ -142,8 +140,6 @@ struct USER_STAT
 //-----------------------------------------------------------------------------
 typedef std::map<IP_DIR_PAIR, STAT_NODE> TRAFF_STAT;
 //-----------------------------------------------------------------------------
-typedef std::pair<double, std::string> CASH_INFO;
-//-----------------------------------------------------------------------------
 struct USER_STAT_RES
 {
     USER_STAT_RES()
@@ -190,8 +186,6 @@ struct USER_STAT_RES
     }
 
     RESETABLE<double>      cash;
-    RESETABLE<CASH_INFO>   cashAdd;
-    RESETABLE<CASH_INFO>   cashSet;
     RESETABLE<double>      freeMb;
     RESETABLE<double>      lastCashAdd;
     RESETABLE<time_t>      lastCashAddTime;