core+face+tools: use asio::ip::address::from_string directly
The compatibility wrappers in ndn-cxx are no longer needed
and will be deprecated soon.
Change-Id: I394164c11dfe776f1d5a6f7c0dceffe9ce6ad85f
diff --git a/core/network.cpp b/core/network.cpp
index 7c96ed3..eafc388 100644
--- a/core/network.cpp
+++ b/core/network.cpp
@@ -25,7 +25,6 @@
#include "network.hpp"
-#include <ndn-cxx/net/address-converter.hpp>
#include <boost/utility/value_init.hpp>
#include <algorithm>
#include <cctype>
@@ -93,8 +92,8 @@
size_t position = networkStr.find('/');
if (position == std::string::npos) {
try {
- network.m_minAddress = ndn::ip::addressFromString(networkStr);
- network.m_maxAddress = ndn::ip::addressFromString(networkStr);
+ network.m_minAddress = ip::address::from_string(networkStr);
+ network.m_maxAddress = ip::address::from_string(networkStr);
}
catch (const boost::system::system_error&) {
is.setstate(std::ios::failbit);
@@ -103,7 +102,7 @@
}
else {
boost::system::error_code ec;
- ip::address address = ndn::ip::addressFromString(networkStr.substr(0, position), ec);
+ auto address = ip::address::from_string(networkStr.substr(0, position), ec);
if (ec) {
is.setstate(std::ios::failbit);
return is;