From 2ccb18345f68e3671b37bcc4720876087e013d6d Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Mon, 14 Jun 2021 13:50:49 -0700 Subject: [PATCH] :bug: warnings removed --- src/bank.cpp | 6 +++--- src/bank_f.cpp | 2 +- src/user.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bank.cpp b/src/bank.cpp index 241495f..a4b57e1 100644 --- a/src/bank.cpp +++ b/src/bank.cpp @@ -121,12 +121,12 @@ int_fast8_t Bank::SendFunds(const std::string &a_name, const std::string &b_name { if (state) { - //if B doesnt exist + //if B does exist if (users.modify_if(b_name, [amount](User &b) { b.balance += amount; })) { - if constexpr (max_log_size) + if constexpr (max_log_size > 0) { Transaction temp(a_name, b_name, amount); Transaction temp2 = temp; @@ -316,7 +316,7 @@ void Bank::Load() user_save.close(); for (const auto &u : temp.getMemberNames()) { - if constexpr (max_log_size) + if constexpr (max_log_size > 0) { users.try_emplace(u, temp[u]["balance"].asUInt(), std::move(temp[u]["password"].asUInt64()), temp[u]["log"]); } diff --git a/src/bank_f.cpp b/src/bank_f.cpp index b47ffe2..b9cdfe5 100644 --- a/src/bank_f.cpp +++ b/src/bank_f.cpp @@ -104,7 +104,7 @@ void BankF::AdminVerifyPass(req_args) } void BankF::GetLog(req_args, const std::string &name) { - if constexpr (max_log_size) + if constexpr (max_log_size > 0) { JSON(bank.GetLogs(name, PASS_HEADER)); } diff --git a/src/user.cpp b/src/user.cpp index ade67c2..bfa0aa5 100644 --- a/src/user.cpp +++ b/src/user.cpp @@ -29,11 +29,11 @@ User::User(uint32_t init_bal, uint64_t init_pass, const Json::Value &log_j) : ba log.data.reserve(std::min(pre_log_size * ((log_j.size() / pre_log_size) + 1), max_log_size)); for (uint32_t i = (log_j.size() - max_log_size) * (log_j.size() > max_log_size); i < log_j.size(); i++) { - log.data.push_back(std::move(Transaction( + log.data.push_back(Transaction( log_j[i]["from"].asCString(), log_j[i]["to"].asCString(), log_j[i]["amount"].asUInt(), - log_j[i]["time"].asUInt64()))); + log_j[i]["time"].asUInt64())); } } } @@ -43,7 +43,7 @@ Json::Value User::Serialize() const Json::Value res; res["balance"] = (Json::UInt)balance; res["password"] = (Json::UInt64)password; - if constexpr (max_log_size) + if constexpr (max_log_size > 0) { res["log"] = log.Serialize(); }