commit afb2059377d62b75af4282a9eb69561061a46dc4
author Yanbiao Li <lybmath2009@gmail.com> Thu Aug 03 16:20:46 2017 -0700
committer Yanbiao Li <lybmath2009@gmail.com> Fri Oct 06 10:15:51 2017 -0700
tree b23a16136443a5313a98254af288d5f45cca6d3b
parent 4e837f8d1265469c25eefc9381c111bfd2b27daa

use ndn::ip::address(V6)FromString for scope-id aware conversion

Change-Id: Ifdc31771b8a990867c0a79ba42b71c87a97bcd56
Refs: #1428

core/network.cpp

diff --git a/core/network.cpp b/core/network.cpp
index 3360e62..19d6f50 100644
--- a/core/network.cpp
+++ b/core/network.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -21,10 +21,11 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "network.hpp"
 
+#include <ndn-cxx/net/address-converter.hpp>
 #include <boost/utility/value_init.hpp>
 #include <algorithm>
 
@@ -105,11 +106,11 @@
 
   size_t position = networkStr.find('/');
   if (position == std::string::npos) {
-    network.m_minAddress = ip::address::from_string(networkStr);
-    network.m_maxAddress = ip::address::from_string(networkStr);
+    network.m_minAddress = ndn::ip::addressFromString(networkStr);
+    network.m_maxAddress = ndn::ip::addressFromString(networkStr);
   }
   else {
-    ip::address address = ip::address::from_string(networkStr.substr(0, position));
+    ip::address address = ndn::ip::addressFromString(networkStr.substr(0, position));
     size_t mask = boost::lexical_cast<size_t>(networkStr.substr(position+1));
 
     if (address.is_v4()) {