Merge 9385549a31 into merged_master (Bitcoin PR #20581)

This commit is contained in:
Andrew Poelstra 2021-06-11 13:09:57 +00:00
commit 34db56ae3a
12 changed files with 16 additions and 16 deletions

View file

@ -967,7 +967,7 @@ std::set<BlockFilterType> g_enabled_filter_types;
std::terminate();
};
bool AppInitBasicSetup(ArgsManager& args)
bool AppInitBasicSetup(const ArgsManager& args)
{
// ********************************************************* Step 1: setup
#ifdef _MSC_VER