Replace boost::scoped_ptr with std::unique_ptr.

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

diff --git a/include/stg/user_stat.h b/include/stg/user_stat.h
index 4c06155dfe82e47980a8e60a13341fac9c8be2ab..4cedb591c085cf95fd46015007c28effc500dc33 100644 (file)
--- a/include/stg/user_stat.h
+++ b/include/stg/user_stat.h
@@ -28,9 +28,11 @@
 #define USER_STAT_H
 
 #include <ctime>
 #define USER_STAT_H
 
 #include <ctime>

+#include <cstdint>

 #include <map>
 #include <map>

+#include <utility>
+#include <string>

 
 

-#include "os_int.h"

 #include "resetable.h"
 #include "user_traff.h"
 //-----------------------------------------------------------------------------
 #include "resetable.h"
 #include "user_traff.h"
 //-----------------------------------------------------------------------------


@@ -140,6 +142,8 @@ struct USER_STAT
 //-----------------------------------------------------------------------------
 typedef std::map<IP_DIR_PAIR, STAT_NODE> TRAFF_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()
 struct USER_STAT_RES
 {
     USER_STAT_RES()


@@ -186,6 +190,8 @@ struct USER_STAT_RES
     }
 
     RESETABLE<double>      cash;
     }
 
     RESETABLE<double>      cash;

+    RESETABLE<CASH_INFO>   cashAdd;
+    RESETABLE<CASH_INFO>   cashSet;

     RESETABLE<double>      freeMb;
     RESETABLE<double>      lastCashAdd;
     RESETABLE<time_t>      lastCashAddTime;
     RESETABLE<double>      freeMb;
     RESETABLE<double>      lastCashAdd;
     RESETABLE<time_t>      lastCashAddTime;