diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-05-04 15:44:50 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-05-04 16:06:42 +0200 |
| commit | 42fd5038197d621bc96bb64e8e730bc5e05314b8 (patch) | |
| tree | 1e65c30048c3e5b10a79e03b814cce8ccee7dd45 /src/validation.h | |
| parent | 0a729b0e42fad486c10d412c2a52a6275128c335 (diff) | |
| parent | faec3dc2adc487af97c22408f9f0bfe33f44a230 (diff) | |
| download | bitcoin-42fd5038197d621bc96bb64e8e730bc5e05314b8.tar.xz | |
Merge #18786: init: Remove boost from ThreadImport
faec3dc2adc487af97c22408f9f0bfe33f44a230 init: Remove boost from ThreadImport (MarcoFalke)
Pull request description:
Can be tested by calling `-reindex` or `-loadblock` and then pressing `CTRL`+`C`.
Should print something like:
```
...
2020-04-27T19:34:31Z [loadblk] Reindexing block file blk00005.dat...
^C2020-04-27T19:34:32Z [loadblk] Shutdown requested. Exit ThreadImport
2020-04-27T19:34:32Z [qt-init] Interrupting HTTP server
...
```
ACKs for top commit:
laanwj:
Code review ACK faec3dc2adc487af97c22408f9f0bfe33f44a230
hebasto:
ACK faec3dc2adc487af97c22408f9f0bfe33f44a230, tested on Linux Mint 19.3 (x86_64) both `bitcoind` and `bitcoin-qt` binaries.
Tree-SHA512: e105af18d98296d82ec99f48e478cf44577e3c32f7e4b47617a7bc7cbf71d6becb92722f229a1be38d58ad29712704509ad9740d8ab8cd3104cf90057664b437
Diffstat (limited to 'src/validation.h')
| -rw-r--r-- | src/validation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.h b/src/validation.h index 0169362768..c4a5cc4593 100644 --- a/src/validation.h +++ b/src/validation.h @@ -182,7 +182,7 @@ FILE* OpenBlockFile(const FlatFilePos &pos, bool fReadOnly = false); /** Translation to a filesystem path */ fs::path GetBlockPosFilename(const FlatFilePos &pos); /** Import blocks from an external file */ -bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, FlatFilePos *dbp = nullptr); +void LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, FlatFilePos* dbp = nullptr); /** Ensures we have a genesis block in the block tree, possibly writing one to disk. */ bool LoadGenesisBlock(const CChainParams& chainparams); /** Load the block tree and coins database from disk, |