commit b0b22419fccc8908ca240c5cb622cb95b8515c3d
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Wed Dec 07 14:33:46 2016 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Dec 08 23:08:19 2016 -0500
tree ba74ef2e1eef68e235dc5daf9e7d28d3e228c46b
parent 94c2d9c4782980de4180a947a4cca84ce1cdb7f6

all: Fixing compatibility with NFD 0.5 and ndn-cxx 0.5

Change-Id: I3d23acf29f4858049d1040a3e421e1c7151b3aba

utils/dummy-keychain.cpp

diff --git a/utils/dummy-keychain.cpp b/utils/dummy-keychain.cpp
index fefc86e..632e6be 100644
--- a/utils/dummy-keychain.cpp
+++ b/utils/dummy-keychain.cpp
@@ -21,6 +21,7 @@
 
 #include <ndn-cxx/util/io.hpp>
 #include <boost/iostreams/device/array.hpp>
+#include <boost/iostreams/stream.hpp>
 
 namespace ndn {
 namespace security {
@@ -119,7 +120,7 @@
 KeyType
 DummyPublicInfo::getPublicKeyType(const Name& keyName)
 {
-  return KEY_TYPE_RSA;
+  return KeyType::RSA;
 }
 
 bool
@@ -141,7 +142,7 @@
     typedef boost::iostreams::stream<boost::iostreams::array_source> arrayStream;
     arrayStream
     is(reinterpret_cast<const char*>(DUMMY_CERT), sizeof(DUMMY_CERT));
-    cert = io::load<IdentityCertificate>(is, io::BASE_64);
+    cert = io::load<IdentityCertificate>(is, io::BASE64);
   }
 
   return cert;

utils/dummy-keychain.hpp

diff --git a/utils/dummy-keychain.hpp b/utils/dummy-keychain.hpp
index 4a1c0fd..c76b95c 100644
--- a/utils/dummy-keychain.hpp
+++ b/utils/dummy-keychain.hpp
@@ -21,6 +21,7 @@
 #define NDNSIM_UTILS_DUMMY_KEYCHAIN_HPP
 
 #include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/security/security-common.hpp>
 
 namespace ndn {
 namespace security {

utils/tracers/ndn-l3-rate-tracer.cpp

diff --git a/utils/tracers/ndn-l3-rate-tracer.cpp b/utils/tracers/ndn-l3-rate-tracer.cpp
index 8d27225..efb09b1 100644
--- a/utils/tracers/ndn-l3-rate-tracer.cpp
+++ b/utils/tracers/ndn-l3-rate-tracer.cpp
@@ -334,11 +334,11 @@
   // no "size" stats
 
   for (const auto& in : entry.getInRecords()) {
-    std::get<0>(m_stats[in.getFace()]).m_satisfiedInterests ++;
+    std::get<0>(m_stats[(in.getFace()).shared_from_this()]).m_satisfiedInterests ++;
   }
 
   for (const auto& out : entry.getOutRecords()) {
-    std::get<0>(m_stats[out.getFace()]).m_outSatisfiedInterests ++;
+    std::get<0>(m_stats[(out.getFace()).shared_from_this()]).m_outSatisfiedInterests ++;
   }
 }
 
@@ -349,11 +349,11 @@
   // no "size" stats
 
   for (const auto& in : entry.getInRecords()) {
-    std::get<0>(m_stats[in.getFace()]).m_timedOutInterests++;
+    std::get<0>(m_stats[(in.getFace()).shared_from_this()]).m_timedOutInterests++;
   }
 
   for (const auto& out : entry.getOutRecords()) {
-    std::get<0>(m_stats[out.getFace()]).m_outTimedOutInterests++;
+    std::get<0>(m_stats[(out.getFace()).shared_from_this()]).m_outTimedOutInterests++;
   }
 }