ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace from_string_checked pair return type with optional<Endpoint>

Browse Source
This commit is contained in:
seelabs
2019-08-14 13:39:49 -07:00
parent 0a256247a0
commit 1eb3753f26
8 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ripple/app/main/Main.cpp
View File

@@ -608,16 +608,16 @@ int run (int argc, char** argv)
// happen after the config file is loaded.
if (vm.count ("rpc_ip"))
{
auto [endpoint, valid] = beast::IP::Endpoint::from_string_checked(
auto endpoint = beast::IP::Endpoint::from_string_checked(
vm["rpc_ip"].as<std::string>());
if (! valid)
if (! endpoint)
{
std::cerr << "Invalid rpc_ip = " <<
vm["rpc_ip"].as<std::string>() << "\n";
return -1;
}
if (endpoint.port() == 0)
if (endpoint->port() == 0)
{
std::cerr << "No port specified in rpc_ip.\n";
if (vm.count ("rpc_port"))
@@ -625,9 +625,9 @@ int run (int argc, char** argv)
std::cerr << "WARNING: using deprecated rpc_port param.\n";
try
{
endpoint = endpoint.at_port(
endpoint = endpoint->at_port(
vm["rpc_port"].as<std::uint16_t>());
if (endpoint.port() == 0)
if (endpoint->port() == 0)
throw std::domain_error("0");
}
catch(std::exception const& e)
@@ -640,7 +640,7 @@ int run (int argc, char** argv)
return -1;
}
config->rpc_ip = std::move(endpoint);
config->rpc_ip = std::move(*endpoint);
}
if (vm.count ("quorum"))