commit a2d76493e8d5389e34e8685678eec5efb7a4ba8a
author Yingdi Yu <yuyingdi@gmail.com> Wed Jul 02 13:43:52 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jul 02 14:23:42 2014 -0700
tree 44c6b66d25b85a607f410fb7b4d1d84da0d5b4ec
parent 7eb59114500be08ad87515c0023c8062fe286655

build: Fix deprecation warning

Change-Id: I2a941afdaf842ba6797f5a98e31613aad470c938

src/sync-logic.cc

diff --git a/src/sync-logic.cc b/src/sync-logic.cc
index c420c55..5f6f83c 100644
--- a/src/sync-logic.cc
+++ b/src/sync-logic.cc
@@ -67,7 +67,7 @@
                       LogicUpdateCallback onUpdate,
                       LogicRemoveCallback onRemove)
   : m_state (new FullState)
-  , m_syncInterestTable (*face->ioService(), time::seconds(m_syncInterestReexpress))
+  , m_syncInterestTable (face->getIoService(), time::seconds(m_syncInterestReexpress))
   , m_syncPrefix (syncPrefix)
   , m_myCertificate(myCertificate)
   , m_onUpdate (onUpdate)
@@ -75,7 +75,7 @@
   , m_perBranch (false)
   , m_validator(validator)
   , m_face(face)
-  , m_scheduler(*face->ioService())
+  , m_scheduler(face->getIoService())
   , m_randomGenerator (static_cast<unsigned int> (std::time (0)))
   , m_rangeUniformRandom (m_randomGenerator, boost::uniform_int<> (200,1000))
   , m_reexpressionJitter (m_randomGenerator, boost::uniform_int<> (100,500))
@@ -98,14 +98,14 @@
                       shared_ptr<Face> face,
                       LogicPerBranchCallback onUpdateBranch)
   : m_state (new FullState)
-  , m_syncInterestTable (*face->ioService(), time::seconds (m_syncInterestReexpress))
+  , m_syncInterestTable (face->getIoService(), time::seconds (m_syncInterestReexpress))
   , m_syncPrefix (syncPrefix)
   , m_myCertificate(myCertificate)
   , m_onUpdateBranch (onUpdateBranch)
   , m_perBranch(true)
   , m_validator(validator)
   , m_face(face)
-  , m_scheduler(*face->ioService())
+  , m_scheduler(face->getIoService())
   , m_randomGenerator (static_cast<unsigned int> (std::time (0)))
   , m_rangeUniformRandom (m_randomGenerator, boost::uniform_int<> (200,1000))
   , m_reexpressionJitter (m_randomGenerator, boost::uniform_int<> (100,500))
@@ -141,13 +141,13 @@
   BOOST_ASSERT (nameLengthDiff > 0);
   BOOST_ASSERT (nameLengthDiff < 3);
 
-  std::string hash = name.get(-1).toEscapedString();
+  std::string hash = name.get(-1).toUri();
   std::string interestType;
 
   if(nameLengthDiff == 1)
     interestType = "normal";
   else
-    interestType = name.get(-2).toEscapedString();
+    interestType = name.get(-2).toUri();
 
   _LOG_DEBUG_ID (hash << ", " << interestType);
 
@@ -169,7 +169,7 @@
     {
       _LOG_DEBUG_ID ("<< I " << name);
 
-      if(name.get(m_syncPrefix.size()).toEscapedString() == "CHRONOS-INTRO-CERT")
+      if(name.get(m_syncPrefix.size()).toUri() == "CHRONOS-INTRO-CERT")
         // it is a certificate, validator will take care of it.
         return;