commit b6fab0f80a727509fb0f26384311ab4e662fbeb3
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Thu Sep 21 16:26:27 2017 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Fri Sep 22 22:16:18 2017 -0700
tree 3ae8625c5d191147b125e203b93a8bd153593237
parent 693c12724b58c009db8cb8c477ca2451a665ec43

Fix compilation against the latest version of ndn-cxx

Change-Id: I7fc1204f50241ec5f972578c3ea69782cd5f311f

tests/test-common.cpp

diff --git a/tests/test-common.cpp b/tests/test-common.cpp
index 8214cf5..42cbf37 100644
--- a/tests/test-common.cpp
+++ b/tests/test-common.cpp
@@ -27,7 +27,7 @@
 
 #include "test-common.hpp"
 
-#include <ndn-cxx/util/digest.hpp>
+#include <ndn-cxx/util/sha256.hpp>
 #include <ndn-cxx/security/signature-sha256-with-rsa.hpp>
 
 namespace ndn {
@@ -106,7 +106,7 @@
 }
 
 shared_ptr<Link>
-makeLink(const Name& name, std::initializer_list<std::pair<uint32_t, Name>> delegations)
+makeLink(const Name& name, std::initializer_list<Delegation> delegations)
 {
   auto link = make_shared<Link>(name, delegations);
   signData(link);

tests/test-common.hpp

diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index 2d2ab6a..3d5dec1 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -36,6 +36,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
+#include <ndn-cxx/link.hpp>
 #include <ndn-cxx/name.hpp>
 #include <ndn-cxx/data.hpp>
 #include <ndn-cxx/lp/nack.hpp>
@@ -132,7 +133,7 @@
  *        If a real signature is desired, sign again with KeyChain.
  */
 shared_ptr<Link>
-makeLink(const Name& name, std::initializer_list<std::pair<uint32_t, Name>> delegations);
+makeLink(const Name& name, std::initializer_list<Delegation> delegations);
 
 /** \brief create a Nack
  *  \param name Interest name
@@ -175,6 +176,4 @@
 } // namespace ndncert
 } // namespace ndn
 
-#include "identity-management-fixture.hpp"
-
 #endif // NDNCERT_TESTS_TEST_COMMON_HPP