diff options
| author | Chun Kuan Lee <[email protected]> | 2018-10-14 04:24:38 +0800 |
|---|---|---|
| committer | Chun Kuan Lee <[email protected]> | 2018-10-15 10:32:43 +0800 |
| commit | b7df96f4565064bcb7cbbf7e2507e03bdcf339f0 (patch) | |
| tree | 9b5a326402b2de1c2f9a9bb36f6ec4756d35fd9c | |
| parent | Merge #14373: Consistency fixes for RPC descriptions (diff) | |
| download | discoin-b7df96f4565064bcb7cbbf7e2507e03bdcf339f0.tar.xz discoin-b7df96f4565064bcb7cbbf7e2507e03bdcf339f0.zip | |
refactor: Drop boost::this_thread::interruption_point and boost::thread_interrupted in main thread
| -rw-r--r-- | src/bitcoin-cli.cpp | 3 | ||||
| -rw-r--r-- | src/bitcoin-tx.cpp | 4 | ||||
| -rw-r--r-- | src/validation.cpp | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index f46650511..ba4586012 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -492,9 +492,6 @@ static int CommandLineRPC(int argc, char *argv[]) } } while (fWait); } - catch (const boost::thread_interrupted&) { - throw; - } catch (const std::exception& e) { strPrint = std::string("error: ") + e.what(); nRet = EXIT_FAILURE; diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index a3fcb8767..2526ce15a 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -820,10 +820,6 @@ static int CommandLineRawTx(int argc, char* argv[]) OutputTx(tx); } - - catch (const boost::thread_interrupted&) { - throw; - } catch (const std::exception& e) { strPrint = std::string("error: ") + e.what(); nRet = EXIT_FAILURE; diff --git a/src/validation.cpp b/src/validation.cpp index 458458d85..36b89365e 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -3819,8 +3819,6 @@ bool CChainState::LoadBlockIndex(const Consensus::Params& consensus_params, CBlo if (!blocktree.LoadBlockIndexGuts(consensus_params, [this](const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { return this->InsertBlockIndex(hash); })) return false; - boost::this_thread::interruption_point(); - // Calculate nChainWork std::vector<std::pair<int, CBlockIndex*> > vSortedByHeight; vSortedByHeight.reserve(mapBlockIndex.size()); |