Merge f8364df250 into merged_master (Bitcoin PR #19176)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:02 +00:00
commit 3aaeae55ea
13 changed files with 60 additions and 50 deletions

View file

@ -56,7 +56,7 @@ namespace {
class NodeImpl : public Node
{
public:
void initError(const std::string& message) override { InitError(Untranslated(message)); }
void initError(const bilingual_str& message) override { InitError(message); }
bool parseParameters(int argc, const char* const argv[], std::string& error) override
{
return gArgs.ParseParameters(argc, argv, error);