mirror of
https://github.com/Expand-sys/CCash
synced 2025-12-16 16:12:14 +11:00
🐛 changed uint64 to time_t
This commit is contained in:
parent
22d8001066
commit
6637f0042e
3 changed files with 7 additions and 4 deletions
|
|
@ -7,9 +7,9 @@ struct Transaction
|
|||
{
|
||||
std::string from = "", to = "";
|
||||
uint32_t amount = 0;
|
||||
uint64_t time = 0;
|
||||
time_t time = 0;
|
||||
|
||||
Transaction();
|
||||
Transaction(std::string from_str, std::string to_str, uint32_t amount, uint64_t time);
|
||||
Transaction(std::string from_str, std::string to_str, uint32_t amount, time_t time);
|
||||
Transaction(std::string from_str, std::string to_str, uint32_t amount);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
#include "transaction.h"
|
||||
|
||||
Transaction::Transaction() = default;
|
||||
Transaction::Transaction(std::string from_str, std::string to_str, uint32_t amount, uint64_t time) : amount(amount), time(time)
|
||||
Transaction::Transaction(std::string from_str, std::string to_str, uint32_t amount, time_t time) : amount(amount), time(time)
|
||||
{
|
||||
from = std::move(from_str);
|
||||
to = std::move(to_str);
|
||||
}
|
||||
Transaction::Transaction(std::string from_str, std::string to_str, uint32_t amount) : amount(amount)
|
||||
{
|
||||
using namespace std::chrono;
|
||||
from = std::move(from_str);
|
||||
to = std::move(to_str);
|
||||
time = std::time(NULL);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,11 @@ User::User(uint32_t init_bal, uint64_t init_pass, const Json::Value &log_j) : ba
|
|||
log_j[i]["from"].asCString(),
|
||||
log_j[i]["to"].asCString(),
|
||||
log_j[i]["amount"].asUInt(),
|
||||
#ifdef _USE_32BIT_TIME_T
|
||||
log_j[i]["time"].asUInt()));
|
||||
#else
|
||||
log_j[i]["time"].asUInt64()));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue