commit 9c57818289aaddeb33ee871d6a89ad3caa3c743d
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed May 14 17:28:28 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu May 15 23:49:41 2014 -0700
tree 8c188ba3b3bbb423a273228f94905d233687f96f
parent 258ec2bf9db653fe5890f3cf4cc7d3d51d5a953b

src: Making use of DEPRECATED macro and updating library code not to use deprecated methods

Change-Id: Ibe17977e7fcbb759a26dbe1cfa3d472598e49bcc

tools/ndnputchunks3.cpp

diff --git a/tools/ndnputchunks3.cpp b/tools/ndnputchunks3.cpp
index e6d74b2..66d0a8e 100644
--- a/tools/ndnputchunks3.cpp
+++ b/tools/ndnputchunks3.cpp
@@ -84,6 +84,7 @@
 
     m_face.setInterestFilter(m_name,
                              bind(&Producer::onInterest, this, _1, _2),
+                             RegisterPrefixSuccessCallback(),
                              bind(&Producer::onRegisterFailed, this, _1, _2));
     m_face.processEvents();
   }

tools/ndnsec-dsk-gen.hpp

diff --git a/tools/ndnsec-dsk-gen.hpp b/tools/ndnsec-dsk-gen.hpp
index d99ea2b..50cd76a 100644
--- a/tools/ndnsec-dsk-gen.hpp
+++ b/tools/ndnsec-dsk-gen.hpp
@@ -72,7 +72,7 @@
 
   Name defaultCertName = keyChain.getDefaultCertificateNameForIdentity(identityName);
   bool isDefaultDsk = false;
-  if (defaultCertName.get(-3).toEscapedString().substr(0,4) == "dsk-")
+  if (defaultCertName.get(-3).toUri().substr(0,4) == "dsk-")
     isDefaultDsk = true;
 
   if (isDefaultDsk)

tools/tlvdump.cpp

diff --git a/tools/tlvdump.cpp b/tools/tlvdump.cpp
index 5f5eac8..47752ae 100644
--- a/tools/tlvdump.cpp
+++ b/tools/tlvdump.cpp
@@ -97,7 +97,7 @@
   if (block.elements().empty())
     {
       std::cout << " [[";
-      ndn::name::Component(block.value(), block.value_size()).toEscapedString(std::cout);
+      ndn::name::Component(block.value(), block.value_size()).toUri(std::cout);
       std::cout<< "]]";
     }
   std::cout << std::endl;
@@ -151,7 +151,7 @@
 {
   while (is.peek() != std::char_traits<char>::eof()) {
     try {
-      ndn::Block block(is);
+      ndn::Block block = ndn::Block::fromStream(is);
       BlockPrinter(block, "");
       // HexPrinter(block, "");
     }