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/fib-manager.cpp

diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index f99bf1e..01e2cc8 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -11,10 +11,8 @@
 #include "mgmt/internal-face.hpp"
 #include "mgmt/app-face.hpp"
 
-#include <ndn-cpp-dev/management/fib-management-options.hpp>
 #include <ndn-cpp-dev/encoding/tlv.hpp>
 
-
 namespace nfd {
 
 NFD_LOG_INIT("FibManager");
@@ -103,7 +101,7 @@
   VerbDispatchTable::const_iterator verbProcessor = m_verbDispatch.find (verb);
   if (verbProcessor != m_verbDispatch.end())
     {
-      ndn::FibManagementOptions options;
+      FibManagementOptions options;
       if (!extractOptions(request, options))
         {
           sendResponse(command, 400, "Malformed command");
@@ -120,7 +118,7 @@
 
       NFD_LOG_INFO("command result: processing verb: " << verb);
 
-      ndn::ControlResponse response;
+      ControlResponse response;
       (verbProcessor->second)(this, options, response);
 
       sendResponse(command, response);
@@ -135,7 +133,7 @@
 
 bool
 FibManager::extractOptions(const Interest& request,
-                           ndn::FibManagementOptions& extractedOptions)
+                           FibManagementOptions& extractedOptions)
 {
   const Name& command = request.getName();
   const size_t optionCompIndex =
@@ -156,8 +154,8 @@
 }
 
 void
-FibManager::insertEntry(const ndn::FibManagementOptions& options,
-                        ndn::ControlResponse& response)
+FibManager::insertEntry(const FibManagementOptions& options,
+                        ControlResponse& response)
 {
   NFD_LOG_DEBUG("insert prefix: " << options.getName());
   NFD_LOG_INFO("insert result: OK"
@@ -167,8 +165,8 @@
 }
 
 void
-FibManager::deleteEntry(const ndn::FibManagementOptions& options,
-                        ndn::ControlResponse& response)
+FibManager::deleteEntry(const FibManagementOptions& options,
+                        ControlResponse& response)
 {
   NFD_LOG_DEBUG("delete prefix: " << options.getName());
   NFD_LOG_INFO("delete result: OK"
@@ -185,8 +183,8 @@
 }
 
 void
-FibManager::addNextHop(const ndn::FibManagementOptions& options,
-                          ndn::ControlResponse& response)
+FibManager::addNextHop(const FibManagementOptions& options,
+                       ControlResponse& response)
 {
   NFD_LOG_DEBUG("add-nexthop prefix: " << options.getName()
                 << " faceid: " << options.getFaceId()
@@ -220,8 +218,8 @@
 }
 
 void
-FibManager::removeNextHop(const ndn::FibManagementOptions& options,
-                             ndn::ControlResponse &response)
+FibManager::removeNextHop(const FibManagementOptions& options,
+                          ControlResponse &response)
 {
   NFD_LOG_DEBUG("remove-nexthop prefix: " << options.getName()
                 << " faceid: " << options.getFaceId());
@@ -254,7 +252,7 @@
 }
 
 void
-FibManager::strategy(const ndn::FibManagementOptions& options, ndn::ControlResponse& response)
+FibManager::strategy(const FibManagementOptions& options, ControlResponse& response)
 {
 
 }