Merge 54f812d9d2 into merged_master (Bitcoin PR #18673)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:23 +00:00
commit fd37b7c5d6
323 changed files with 446 additions and 438 deletions

View file

@ -1,14 +1,16 @@
// Copyright (c) 2015-2019 The Bitcoin Core developers
// Copyright (c) 2015-2020 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <bench/bench.h>
#include <util/system.h>
#include <checkqueue.h>
#include <prevector.h>
#include <vector>
#include <boost/thread/thread.hpp>
#include <random.h>
#include <util/system.h>
#include <boost/thread/thread.hpp>
#include <vector>
static const int MIN_CORES = 2;