diff options
author | luigi1111 <luigi1111w@gmail.com> | 2018-06-20 14:41:05 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2018-06-20 14:41:05 -0500 |
commit | 7935bc5f6b6c5800efcfcce172fc542c28bc114c (patch) | |
tree | bac96e09ea5cd320427600a551804a932faa91c7 | |
parent | Merge pull request #3919 (diff) | |
parent | Fixes #3645: error on freebsd lambda return values forced to std::string (diff) | |
download | monero-7935bc5f6b6c5800efcfcce172fc542c28bc114c.tar.xz |
Merge pull request #3924
afed978 Fixes #3645: error on freebsd lambda return values forced to std::string (rockhouse)
-rw-r--r-- | src/blockchain_utilities/blockchain_blackball.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/blockchain_utilities/blockchain_blackball.cpp b/src/blockchain_utilities/blockchain_blackball.cpp index 95eb2f73d..52d2938cd 100644 --- a/src/blockchain_utilities/blockchain_blackball.cpp +++ b/src/blockchain_utilities/blockchain_blackball.cpp @@ -235,7 +235,7 @@ int main(int argc, char* argv[]) "blackball-db-dir", "Specify blackball database directory", get_default_db_path(), {{ &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]) return (boost::filesystem::path(val) / "testnet").string(); else if (testnet_stagenet[1]) |