diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-08-21 15:54:10 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-08-21 15:54:10 -0500 |
| commit | cdfa2e58df010d1e11e5081140506af8de0fa18e (patch) | |
| tree | 4eb5c2faff881e6f37193fe5428c0a6b3ea767c3 | |
| parent | Merge pull request #5817 (diff) | |
| parent | fix feature not introduced until boost 1.66 (diff) | |
| download | monero-cdfa2e58df010d1e11e5081140506af8de0fa18e.tar.xz | |
Merge pull request #5827
30779de fix feature not introduced until boost 1.66 (jtgrassie)
| -rw-r--r-- | contrib/epee/include/net/local_ip.h | 2 | ||||
| -rw-r--r-- | src/net/parse.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/epee/include/net/local_ip.h b/contrib/epee/include/net/local_ip.h index 7523f9d81..ce74e1cd3 100644 --- a/contrib/epee/include/net/local_ip.h +++ b/contrib/epee/include/net/local_ip.h @@ -39,7 +39,7 @@ namespace epee inline bool is_ipv6_local(const std::string& ip) { - auto addr = boost::asio::ip::make_address_v6(ip); + auto addr = boost::asio::ip::address_v6::from_string(ip); // ipv6 link-local unicast addresses are fe80::/10 bool is_link_local = addr.is_link_local(); diff --git a/src/net/parse.cpp b/src/net/parse.cpp index 7b74f2b75..ce580afe7 100644 --- a/src/net/parse.cpp +++ b/src/net/parse.cpp @@ -76,7 +76,7 @@ namespace net return i2p_address::make(address, default_port); boost::system::error_code ec; - boost::asio::ip::address_v6 v6 = boost::asio::ip::make_address_v6(host_str, ec); + boost::asio::ip::address_v6 v6 = boost::asio::ip::address_v6::from_string(host_str, ec); ipv6 = !ec; std::uint16_t port = default_port; |