Merge 0a13d15c14 into merged_master (Bitcoin PR #20530)

This commit is contained in:
Andrew Poelstra 2021-06-10 23:32:14 +00:00
commit 406e81efb5
19 changed files with 32 additions and 23 deletions

View file

@ -231,7 +231,7 @@ public:
Optional<std::vector<std::string>> list_value;
const char* error = nullptr;
Expect(util::SettingsValue s) : setting(std::move(s)) {}
explicit Expect(util::SettingsValue s) : setting(std::move(s)) {}
Expect& DefaultString() { default_string = true; return *this; }
Expect& DefaultInt() { default_int = true; return *this; }
Expect& DefaultBool() { default_bool = true; return *this; }