]>
Commit | Line | Data |
---|---|---|
a0ab8273 JP |
1 | Description: fix convert atomic to non-atomic integer for UniValue |
2 | Fixes Bitcoin 0.20.1 build failure when linked with mainline UniValue: | |
3 | rpc/blockchain.cpp:2077:35: error: cannot convert 'std::atomic<int>' to 'const UniValue&' | |
4 | Author: Jonas Smedegaard <dr@jones.dk> | |
5 | License: Expat | |
6 | Last-Update: 2020-11-26 | |
7 | --- | |
8 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
9 | --- a/src/rpc/blockchain.cpp | |
10 | +++ b/src/rpc/blockchain.cpp | |
11 | @@ -2187,7 +2187,7 @@ | |
12 | // no scan in progress | |
13 | return NullUniValue; | |
14 | } | |
15 | - result.pushKV("progress", g_scan_progress); | |
16 | + result.pushKV("progress", (int)g_scan_progress); | |
17 | return result; | |
18 | } else if (request.params[0].get_str() == "abort") { | |
19 | CoinsViewScanReserver reserver; |