Merge pull request #3924

afed978 Fixes #3645: error on freebsd lambda return values forced to std::string (rockhouse)
This commit is contained in:
luigi1111 2018-06-20 14:41:05 -05:00
commit 7935bc5f6b
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -235,7 +235,7 @@ int main(int argc, char* argv[])
"blackball-db-dir", "Specify blackball database directory", "blackball-db-dir", "Specify blackball database directory",
get_default_db_path(), get_default_db_path(),
{{ &arg_testnet_on, &arg_stagenet_on }}, {{ &arg_testnet_on, &arg_stagenet_on }},
[](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) { [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val)->std::string {
if (testnet_stagenet[0]) if (testnet_stagenet[0])
return (boost::filesystem::path(val) / "testnet").string(); return (boost::filesystem::path(val) / "testnet").string();
else if (testnet_stagenet[1]) else if (testnet_stagenet[1])