Merge 5b24f6084e into merged_master (Bitcoin PR #16224)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:40 +00:00
commit 1d1a32e637
23 changed files with 169 additions and 147 deletions

View file

@ -28,6 +28,7 @@
#include <txmempool.h>
#include <ui_interface.h>
#include <util/system.h>
#include <util/translation.h>
#include <validation.h>
#include <warnings.h>
@ -54,7 +55,7 @@ namespace {
class NodeImpl : public Node
{
public:
void initError(const std::string& message) override { InitError(message); }
void initError(const std::string& message) override { InitError(Untranslated(message)); }
bool parseParameters(int argc, const char* const argv[], std::string& error) override
{
return gArgs.ParseParameters(argc, argv, error);