commit d482fd3b6b9419a1d04f7030757f52595123ebd7
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Feb 09 23:40:20 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Feb 10 12:14:17 2014 -0800
tree 7ffabc20c54e146689fe1361841153497b435999
parent 1d80cd057fba4fefab65e2e39f33edb9997ce8a6

build: Fixes for the latest reorganizations in ndn-cpp-dev library

Change-Id: I7cdb1e680342f72d90da6bc41028388dc57a22c0

daemon/mgmt/manager-base.hpp

diff --git a/daemon/mgmt/manager-base.hpp b/daemon/mgmt/manager-base.hpp
index e8da7c9..e8d63cf 100644
--- a/daemon/mgmt/manager-base.hpp
+++ b/daemon/mgmt/manager-base.hpp
@@ -8,10 +8,12 @@
 #define NFD_MGMT_MANAGER_BASE_HPP
 
 #include "common.hpp"
-#include <ndn-cpp-dev/management/control-response.hpp>
+#include <ndn-cpp-dev/management/nfd-control-response.hpp>
 
 namespace nfd {
 
+using ndn::nfd::ControlResponse;
+
 class AppFace;
 
 class ManagerBase
@@ -25,13 +27,13 @@
 protected:
 
   void
-  setResponse(ndn::ControlResponse& response,
+  setResponse(ControlResponse& response,
               uint32_t code,
               const std::string& text);
 
   void
   sendResponse(const Name& name,
-               const ndn::ControlResponse& response);
+               const ControlResponse& response);
 
   void
   sendResponse(const Name& name,
@@ -43,7 +45,7 @@
 };
 
 inline void
-ManagerBase::setResponse(ndn::ControlResponse& response,
+ManagerBase::setResponse(ControlResponse& response,
                          uint32_t code,
                          const std::string& text)
 {