Merge pull request #4066

84d9e7f blockchain: fix build after waiter::wait prototype change (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-27 20:15:10 -05:00
commit 008b9036a3
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -2745,7 +2745,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
tools::threadpool& tpool = tools::threadpool::getInstance(); tools::threadpool& tpool = tools::threadpool::getInstance();
tools::threadpool::waiter waiter; tools::threadpool::waiter waiter;
const auto waiter_guard = epee::misc_utils::create_scope_leave_handler([&]() { waiter.wait(); }); const auto waiter_guard = epee::misc_utils::create_scope_leave_handler([&]() { waiter.wait(&tpool); });
int threads = tpool.get_max_concurrency(); int threads = tpool.get_max_concurrency();
for (const auto& txin : tx.vin) for (const auto& txin : tx.vin)