aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorW. J. van der Laan <laanwj@protonmail.com>2021-10-04 12:49:04 +0200
committerW. J. van der Laan <laanwj@protonmail.com>2021-10-04 12:59:28 +0200
commitcdb4dfcbf1c82ef4c4eb7bb982b35219d5dbf827 (patch)
treea89fc72c12ef05a3c880e7268fd26962e5a50816 /src/wallet
parentc6f710ec985518ccff6dd69426625f2ed0d102f8 (diff)
parent4343f114cc661cf031ec915538c11b9b030e2e15 (diff)
Merge bitcoin/bitcoin#20452: util: Replace use of locale dependent atoi(…) with locale-independent std::from_chars(…) (C++17)
4343f114cc661cf031ec915538c11b9b030e2e15 Replace use of locale dependent atoi(…) with locale-independent std::from_chars(…) (C++17) (practicalswift) Pull request description: Replace use of locale dependent `atoi(…)` with locale-independent `std::from_chars(…)` (C++17). ACKs for top commit: laanwj: Code review ACK 4343f114cc661cf031ec915538c11b9b030e2e15 jonatack: Code review ACK 4343f114cc661cf031ec915538c11b9b030e2e15 Tree-SHA512: e4909da282b6cefc5ca34e13b02cc489af56cab339a77ae5c35ac9ef355d9b941b129a2bfddc1b37426b11c79a21c8b729fbb5255e6d9eaa344406b18b825494
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/transaction.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/transaction.h b/src/wallet/transaction.h
index 0cd91b9ebe..223901586e 100644
--- a/src/wallet/transaction.h
+++ b/src/wallet/transaction.h
@@ -216,9 +216,9 @@ public:
}
const auto it_op = mapValue.find("n");
- nOrderPos = (it_op != mapValue.end()) ? atoi64(it_op->second) : -1;
+ nOrderPos = (it_op != mapValue.end()) ? LocaleIndependentAtoi<int64_t>(it_op->second) : -1;
const auto it_ts = mapValue.find("timesmart");
- nTimeSmart = (it_ts != mapValue.end()) ? static_cast<unsigned int>(atoi64(it_ts->second)) : 0;
+ nTimeSmart = (it_ts != mapValue.end()) ? static_cast<unsigned int>(LocaleIndependentAtoi<int64_t>(it_ts->second)) : 0;
mapValue.erase("fromaccount");
mapValue.erase("spent");