4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-15 04:46:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3502

Browse Source 
11c933e1 fix lambda compile error on openbsd (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-04-12 11:14:43 +02:00
commit 5053f8f40b
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/cryptonote_core.cpp
View File

@ -81,7 +81,7 @@ namespace cryptonote
, "Specify data directory" , "Specify data directory"
, tools::get_default_data_dir() , tools::get_default_data_dir()
, {{ &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])

6
src/daemon/command_line_args.h
View File

@ -42,7 +42,7 @@ namespace daemon_args
, "Specify configuration file" , "Specify configuration file"
, (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".conf")).string() , (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".conf")).string()
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }} , {{ &cryptonote::arg_testnet_on, &cryptonote::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] && defaulted) if (testnet_stagenet[0] && defaulted)
return (daemonizer::get_default_data_dir() / "testnet" / return (daemonizer::get_default_data_dir() / "testnet" /
std::string(CRYPTONOTE_NAME ".conf")).string(); std::string(CRYPTONOTE_NAME ".conf")).string();
@ -57,7 +57,7 @@ namespace daemon_args
, "Specify log file" , "Specify log file"
, (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".log")).string() , (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".log")).string()
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }} , {{ &cryptonote::arg_testnet_on, &cryptonote::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] && defaulted) if (testnet_stagenet[0] && defaulted)
return (daemonizer::get_default_data_dir() / "testnet" / return (daemonizer::get_default_data_dir() / "testnet" /
std::string(CRYPTONOTE_NAME ".log")).string(); std::string(CRYPTONOTE_NAME ".log")).string();
@ -102,7 +102,7 @@ namespace daemon_args
, "Port for ZMQ RPC server to listen on" , "Port for ZMQ RPC server to listen on"
, std::to_string(config::ZMQ_RPC_DEFAULT_PORT) , std::to_string(config::ZMQ_RPC_DEFAULT_PORT)
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }} , {{ &cryptonote::arg_testnet_on, &cryptonote::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] && defaulted) if (testnet_stagenet[0] && defaulted)
return std::to_string(config::testnet::ZMQ_RPC_DEFAULT_PORT); return std::to_string(config::testnet::ZMQ_RPC_DEFAULT_PORT);
if (testnet_stagenet[1] && defaulted) if (testnet_stagenet[1] && defaulted)

2
src/p2p/net_node.cpp
View File

@ -39,7 +39,7 @@ namespace nodetool
, "Port for p2p network protocol" , "Port for p2p network protocol"
, std::to_string(config::P2P_DEFAULT_PORT) , std::to_string(config::P2P_DEFAULT_PORT)
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }} , {{ &cryptonote::arg_testnet_on, &cryptonote::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] && defaulted) if (testnet_stagenet[0] && defaulted)
return std::to_string(config::testnet::P2P_DEFAULT_PORT); return std::to_string(config::testnet::P2P_DEFAULT_PORT);
else if (testnet_stagenet[1] && defaulted) else if (testnet_stagenet[1] && defaulted)

2
src/rpc/core_rpc_server.cpp
View File

@ -2117,7 +2117,7 @@ namespace cryptonote
, "Port for RPC server" , "Port for RPC server"
, std::to_string(config::RPC_DEFAULT_PORT) , std::to_string(config::RPC_DEFAULT_PORT)
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }} , {{ &cryptonote::arg_testnet_on, &cryptonote::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] && defaulted) if (testnet_stagenet[0] && defaulted)
return std::to_string(config::testnet::RPC_DEFAULT_PORT); return std::to_string(config::testnet::RPC_DEFAULT_PORT);
else if (testnet_stagenet[1] && defaulted) else if (testnet_stagenet[1] && defaulted)

2
src/wallet/wallet2.cpp
View File

@ -145,7 +145,7 @@ struct options {
"shared-ringdb-dir", tools::wallet2::tr("Set shared ring database path"), "shared-ringdb-dir", tools::wallet2::tr("Set shared ring database path"),
get_default_ringdb_path(), get_default_ringdb_path(),
testnet, testnet,
[](bool testnet, bool defaulted, std::string val) { [](bool testnet, bool defaulted, std::string val)->std::string {
if (testnet) if (testnet)
return (boost::filesystem::path(val) / "testnet").string(); return (boost::filesystem::path(val) / "testnet").string();
return val; return val;