Move strategy into job.

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

diff --git a/include/stg/user_stat.h b/include/stg/user_stat.h
index a486a56efe8eca612a13b32542e78d7e33e9acc4..0ecd9e15b43274a3dbabb4ccbf1198e778ca6c3f 100644 (file)
--- a/include/stg/user_stat.h
+++ b/include/stg/user_stat.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
 
 #pragma once
 

-#include "stg/optional.h"

 #include "user_traff.h"
 
 #include <ctime>
 #include "user_traff.h"
 
 #include <ctime>


@@ -28,6 +27,7 @@
 #include <map>
 #include <utility>
 #include <string>
 #include <map>
 #include <utility>
 #include <string>

+#include <optional>

 
 namespace STG
 {
 
 namespace STG
 {


@@ -180,14 +180,14 @@ struct UserStatOpt
     UserStatOpt(UserStatOpt&&) = default;
     UserStatOpt& operator=(UserStatOpt&&) = default;
 
     UserStatOpt(UserStatOpt&&) = default;
     UserStatOpt& operator=(UserStatOpt&&) = default;
 

-    Optional<double>    cash;
-    Optional<CashInfo>  cashAdd;
-    Optional<CashInfo>  cashSet;
-    Optional<double>    freeMb;
-    Optional<double>    lastCashAdd;
-    Optional<time_t>    lastCashAddTime;
-    Optional<time_t>    passiveTime;
-    Optional<time_t>    lastActivityTime;
+    std::optional<double>    cash;
+    std::optional<CashInfo>  cashAdd;
+    std::optional<CashInfo>  cashSet;
+    std::optional<double>    freeMb;
+    std::optional<double>    lastCashAdd;
+    std::optional<time_t>    lastCashAddTime;
+    std::optional<time_t>    passiveTime;
+    std::optional<time_t>    lastActivityTime;

     DirTraffOpt         sessionUp;
     DirTraffOpt         sessionDown;
     DirTraffOpt         monthUp;
     DirTraffOpt         sessionUp;
     DirTraffOpt         sessionDown;
     DirTraffOpt         monthUp;