From b7df96f4565064bcb7cbbf7e2507e03bdcf339f0 Mon Sep 17 00:00:00 2001 From: Chun Kuan Lee Date: Sun, 14 Oct 2018 04:24:38 +0800 Subject: refactor: Drop boost::this_thread::interruption_point and boost::thread_interrupted in main thread --- src/bitcoin-cli.cpp | 3 --- src/bitcoin-tx.cpp | 4 ---- src/validation.cpp | 2 -- 3 files changed, 9 deletions(-) diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index f466505114..ba4586012d 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 a3fcb87675..2526ce15a2 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 458458d85d..36b89365e4 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 > vSortedByHeight; vSortedByHeight.reserve(mapBlockIndex.size()); -- cgit v1.2.3