SunnyQjm/NFD
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: move common.hpp to core/

Browse Source 
Headers in core/ are now included as `#include "core/*.hpp"`.
This allows NFD to rely less on include paths when used as a submodule in
another codebase, such as ndnSIM and NFD-Android.

refs #3127

Change-Id: Ia38f3c97427e17ff7b5401281f1fe875b5d5313e
This commit is contained in:
Junxiao Shi committed 2016-08-05 03:54:28 +00:00
1 parent 38f4ce9f25
commit 9f5b01dfd8
51 files changed
+129 -139
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common.hpp → core/common.hpp
+4 -4
View File
@@ -23,10 +23,10 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef NFD_COMMON_HPP
#define NFD_COMMON_HPP
#ifndef NFD_CORE_COMMON_HPP
#define NFD_CORE_COMMON_HPP
#include "config.hpp"
#include "core/config.hpp"
#ifdef WITH_TESTS
#define VIRTUAL_WITH_TESTS virtual
@@ -116,4 +116,4 @@ namespace signal = ndn::util::signal;
} // namespace nfd
#endif // NFD_COMMON_HPP
#endif // NFD_CORE_COMMON_HPP
version.hpp.in → core/version.hpp.in
+10 -10
View File
@@ -1,12 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis.
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -23,8 +23,8 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef NFD_VERSION_HPP
#define NFD_VERSION_HPP
#ifndef NFD_CORE_VERSION_HPP
#define NFD_CORE_VERSION_HPP
namespace nfd {
@@ -71,4 +71,4 @@ namespace nfd {
} // namespace nfd
#endif // NFD_VERSION_HPP
#endif // NFD_CORE_VERSION_HPP
daemon/face/ethernet-transport.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_FACE_ETHERNET_TRANSPORT_HPP
#define NFD_DAEMON_FACE_ETHERNET_TRANSPORT_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "transport.hpp"
#include "core/network-interface.hpp"
daemon/face/generic-link-service.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_FACE_GENERIC_LINK_SERVICE_HPP
#define NFD_DAEMON_FACE_GENERIC_LINK_SERVICE_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "core/logger.hpp"
#include "link-service.hpp"
daemon/face/udp-protocol.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_FACE_UDP_PROTOCOL_HPP
#define NFD_DAEMON_FACE_UDP_PROTOCOL_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
namespace udp {
daemon/fw/asf-probing-module.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "asf-probing-module.hpp"
#include "random.hpp"
#include "core/random.hpp"
#include <boost/random/uniform_real_distribution.hpp>
daemon/fw/forwarder.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_FW_FORWARDER_HPP
#define NFD_DAEMON_FW_FORWARDER_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "core/scheduler.hpp"
#include "forwarder-counters.hpp"
#include "face-table.hpp"
daemon/fw/rtt-estimator.hpp
+9 -9
View File
@@ -1,12 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014 Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis.
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -21,12 +21,12 @@
*
* You should have received a copy of the GNU General Public License along with
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
**/
*/
#ifndef NFD_DAEMON_FW_RTT_ESTIMATOR_HPP
#define NFD_DAEMON_FW_RTT_ESTIMATOR_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
daemon/fw/strategy-info.hpp
+8 -8
View File
@@ -1,12 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis.
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_FW_STRATEGY_INFO_HPP
#define NFD_DAEMON_FW_STRATEGY_INFO_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
namespace fw {
daemon/fw/strategy-registry.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_FW_STRATEGY_REGISTRY_HPP
#define NFD_DAEMON_FW_STRATEGY_REGISTRY_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
daemon/main.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "nfd.hpp"
#include "rib/service.hpp"
#include "version.hpp"
#include "core/version.hpp"
#include "core/global-io.hpp"
#include "core/logger.hpp"
#include "core/privilege-helper.hpp"
daemon/mgmt/command-validator.hpp
+9 -9
View File
@@ -1,11 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014 Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis.
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -20,13 +21,12 @@
*
* You should have received a copy of the GNU General Public License along with
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
**/
*/
#ifndef NFD_DAEMON_MGMT_COMMAND_VALIDATOR_HPP
#define NFD_DAEMON_MGMT_COMMAND_VALIDATOR_HPP
#include "common.hpp"
#include "config-file.hpp"
#include "core/config-file.hpp"
#include <ndn-cxx/util/command-interest-validator.hpp>
namespace nfd {
daemon/mgmt/forwarder-status-manager.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -25,7 +25,7 @@
#include "forwarder-status-manager.hpp"
#include "fw/forwarder.hpp"
#include "version.hpp"
#include "core/version.hpp"
namespace nfd {
daemon/mgmt/forwarder-status-manager.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_MGMT_FORWARDER_STATUS_MANAGER_HPP
#define NFD_DAEMON_MGMT_FORWARDER_STATUS_MANAGER_HPP
#include "manager-base.hpp"
#include "core/manager-base.hpp"
#include <ndn-cxx/management/nfd-forwarder-status.hpp>
namespace nfd {
daemon/mgmt/general-config-section.cpp
+8 -8
View File
@@ -1,11 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014 Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis.
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -20,11 +21,10 @@
*
* You should have received a copy of the GNU General Public License along with
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
**/
*/
#include "general-config-section.hpp"
#include "common.hpp"
#include "core/logger.hpp"
#include "core/privilege-helper.hpp"
#include "core/config-file.hpp"
daemon/mgmt/nfd-manager-base.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_MGMT_NFD_MANAGER_BASE_HPP
#define NFD_DAEMON_MGMT_NFD_MANAGER_BASE_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "command-validator.hpp"
#include "core/manager-base.hpp"
daemon/mgmt/tables-config-section.cpp
+1 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -25,7 +25,6 @@
#include "tables-config-section.hpp"
#include "common.hpp"
#include "core/logger.hpp"
#include "core/config-file.hpp"
daemon/nfd.hpp
+1 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,6 @@
#ifndef NFD_DAEMON_NFD_HPP
#define NFD_DAEMON_NFD_HPP
#include "common.hpp"
#include "core/config-file.hpp"
#include "core/scheduler.hpp"
daemon/table/cs-entry.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_TABLE_CS_ENTRY_HPP
#define NFD_DAEMON_TABLE_CS_ENTRY_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
namespace cs {
daemon/table/cs-internal.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -30,7 +30,7 @@
#ifndef NFD_DAEMON_TABLE_CS_INTERNAL_HPP
#define NFD_DAEMON_TABLE_CS_INTERNAL_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
namespace cs {
daemon/table/cs-policy-lru.hpp
+2 -2
View File
@@ -27,7 +27,7 @@
#define NFD_DAEMON_TABLE_CS_POLICY_LRU_HPP
#include "cs-policy.hpp"
#include "common.hpp"
#include "core/common.hpp"
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/sequenced_index.hpp>
@@ -103,4 +103,4 @@ using lru::LruPolicy;
} // namespace cs
} // namespace nfd
#endif // NFD_DAEMON_TABLE_CS_POLICY_LRU_HPP
#endif // NFD_DAEMON_TABLE_CS_POLICY_LRU_HPP
daemon/table/cs-policy-priority-fifo.hpp
-1
View File
@@ -27,7 +27,6 @@
#define NFD_DAEMON_TABLE_CS_POLICY_FIFO_HPP
#include "cs-policy.hpp"
#include "common.hpp"
#include "core/scheduler.hpp"
namespace nfd {
daemon/table/dead-nonce-list.hpp
+8 -8
View File
@@ -1,12 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
* Washington University in St. Louis,
* Beijing Institute of Technology,
* The University of Memphis.
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_TABLE_DEAD_NONCE_LIST_HPP
#define NFD_DAEMON_TABLE_DEAD_NONCE_LIST_HPP
#include "common.hpp"
#include "core/common.hpp"
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/multi_index/hashed_index.hpp>
daemon/table/fib-nexthop.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_TABLE_FIB_NEXTHOP_HPP
#define NFD_DAEMON_TABLE_FIB_NEXTHOP_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "face/face.hpp"
namespace nfd {
daemon/table/measurements-entry.hpp
-1
View File
@@ -26,7 +26,6 @@
#ifndef NFD_DAEMON_TABLE_MEASUREMENTS_ENTRY_HPP
#define NFD_DAEMON_TABLE_MEASUREMENTS_ENTRY_HPP
#include "common.hpp"
#include "strategy-info-host.hpp"
#include "core/scheduler.hpp"
daemon/table/name-tree-entry.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_TABLE_NAME_TREE_ENTRY_HPP
#define NFD_DAEMON_TABLE_NAME_TREE_ENTRY_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "table/fib-entry.hpp"
#include "table/pit-entry.hpp"
#include "table/measurements-entry.hpp"
daemon/table/name-tree.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_TABLE_NAME_TREE_HPP
#define NFD_DAEMON_TABLE_NAME_TREE_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "name-tree-entry.hpp"
namespace nfd {
daemon/table/network-region-table.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_TABLE_NETWORK_REGION_TABLE_HPP
#define NFD_DAEMON_TABLE_NETWORK_REGION_TABLE_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
daemon/table/strategy-choice-entry.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_DAEMON_TABLE_STRATEGY_CHOICE_ENTRY_HPP
#define NFD_DAEMON_TABLE_STRATEGY_CHOICE_ENTRY_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
rib/fib-update.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_RIB_FIB_UPDATE_HPP
#define NFD_RIB_FIB_UPDATE_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
namespace rib {
rib/fib-updater.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_RIB_FIB_UPDATER_HPP
#define NFD_RIB_FIB_UPDATER_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "fib-update.hpp"
#include "rib.hpp"
#include "rib-update-batch.hpp"
rib/rib-update-batch.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_RIB_RIB_UPDATE_BATCH_HPP
#define NFD_RIB_RIB_UPDATE_BATCH_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "rib-update.hpp"
namespace nfd {
rib/rib-update.hpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,7 @@
#ifndef NFD_RIB_RIB_UPDATE_HPP
#define NFD_RIB_RIB_UPDATE_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "route.hpp"
namespace nfd {
rib/rib.hpp
+4 -8
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,8 +26,6 @@
#ifndef NFD_RIB_RIB_HPP
#define NFD_RIB_RIB_HPP
#include "common.hpp"
#include "rib-entry.hpp"
#include "rib-update-batch.hpp"
@@ -131,6 +129,9 @@ public:
void
onRouteExpiration(const Name& prefix, const Route& route);
void
insert(const Name& prefix, const Route& route);
private:
/** \brief adds the passed update to a RibUpdateBatch and adds the batch to
* the end of the update queue.
@@ -161,11 +162,6 @@ PUBLIC_WITH_TESTS_ELSE_PRIVATE:
// Used by RibManager unit-tests to get sent batch to simulate successful FIB update
function<void(RibUpdateBatch)> m_onSendBatchFromQueue;
public:
void
insert(const Name& prefix, const Route& route);
PUBLIC_WITH_TESTS_ELSE_PRIVATE:
void
erase(const Name& prefix, const Route& route);
rib/route.hpp
+1 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,7 +26,6 @@
#ifndef NFD_RIB_ROUTE_HPP
#define NFD_RIB_ROUTE_HPP
#include "common.hpp"
#include "core/scheduler.hpp"
#include <ndn-cxx/encoding/nfd-constants.hpp>
rib/service.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_RIB_SERVICE_HPP
#define NFD_RIB_SERVICE_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "core/config-file.hpp"
#include <ndn-cxx/face.hpp>
tests/core/ndebug.t.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -23,7 +23,7 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common.hpp"
#include "core/common.hpp"
#include "tests/test-common.hpp"
tests/core/version.t.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -23,7 +23,7 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#include "version.hpp"
#include "core/version.hpp"
#include "core/logger.hpp"
#include "tests/test-common.hpp"
tests/daemon/face/dummy-receive-link-service.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_TESTS_DAEMON_FACE_DUMMY_RECEIVE_LINK_SERVICE_HPP
#define NFD_TESTS_DAEMON_FACE_DUMMY_RECEIVE_LINK_SERVICE_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "face/link-service.hpp"
tests/daemon/face/dummy-transport.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_TESTS_DAEMON_FACE_DUMMY_TRANSPORT_HPP
#define NFD_TESTS_DAEMON_FACE_DUMMY_TRANSPORT_HPP
#include "common.hpp"
#include "core/common.hpp"
#include "face/transport.hpp"
tests/daemon/mgmt/forwarder-status-manager.t.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
*/
#include "mgmt/forwarder-status-manager.hpp"
#include "version.hpp"
#include "core/version.hpp"
#include "nfd-manager-common-fixture.hpp"
tests/wscript
+8 -7
View File
@@ -1,12 +1,13 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
"""
Copyright (c) 2014 Regents of the University of California,
Arizona Board of Regents,
Colorado State University,
University Pierre & Marie Curie, Sorbonne University,
Washington University in St. Louis,
Beijing Institute of Technology
Copyright (c) 2014-2016, Regents of the University of California,
Arizona Board of Regents,
Colorado State University,
University Pierre & Marie Curie, Sorbonne University,
Washington University in St. Louis,
Beijing Institute of Technology,
The University of Memphis.
This file is part of NFD (Named Data Networking Forwarding Daemon).
See AUTHORS.md for complete list of NFD authors and contributors.
@@ -36,7 +37,7 @@ def build(bld):
features='cxx pch',
source=bld.path.ant_glob(['*.cpp'], excl='main.cpp'),
use='core-objects',
headers='../common.hpp boost-test.hpp',
headers='../core/common.hpp boost-test.hpp',
defines='UNIT_TEST_CONFIG_PATH=\"%s/tmp-files/\"' % bld.bldnode,
)
tools/ndn-autoconfig-server.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#include "version.hpp"
#include "core/version.hpp"
#include <ndn-cxx/encoding/tlv-nfd.hpp>
#include <ndn-cxx/face.hpp>
#include <ndn-cxx/security/key-chain.hpp>
tools/ndn-autoconfig/base.hpp
+2 -4
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,9 +26,7 @@
#ifndef NFD_TOOLS_NDN_AUTOCONFIG_BASE_HPP
#define NFD_TOOLS_NDN_AUTOCONFIG_BASE_HPP
#include "common.hpp"
#include <boost/noncopyable.hpp>
#include "core/common.hpp"
#include <ndn-cxx/face.hpp>
#include <ndn-cxx/security/key-chain.hpp>
tools/ndn-autoconfig/main.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -23,7 +23,7 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#include "version.hpp"
#include "core/version.hpp"
#include "multicast-discovery.hpp"
#include "guess-from-search-domains.hpp"
tools/nfd-autoreg.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -37,7 +37,7 @@
#include <boost/program_options/variables_map.hpp>
#include <boost/program_options/parsers.hpp>
#include "version.hpp"
#include "core/version.hpp"
#include "core/network.hpp"
using namespace ndn::nfd;
tools/nfd-status/format-helpers.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_TOOLS_NFD_STATUS_FORMAT_HELPERS_HPP
#define NFD_TOOLS_NFD_STATUS_FORMAT_HELPERS_HPP
#include "common.hpp"
#include "core/common.hpp"
namespace nfd {
namespace tools {
tools/nfd-status/main.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
#include "version.hpp"
#include "core/version.hpp"
#include <ndn-cxx/security/validator-null.hpp>
#include <boost/program_options/options_description.hpp>
tools/nfd-status/module.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#ifndef NFD_TOOLS_NFD_STATUS_MODULE_HPP
#define NFD_TOOLS_NFD_STATUS_MODULE_HPP
#include "common.hpp"
#include "core/common.hpp"
#include <ndn-cxx/management/nfd-controller.hpp>
namespace nfd {
tools/nfdc.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -24,7 +24,7 @@
*/
#include "nfdc.hpp"
#include "version.hpp"
#include "core/version.hpp"
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
wscript
+5 -5
View File
@@ -156,15 +156,15 @@ main(int, char**)
if not conf.options.debug:
conf.define('NDEBUG', 1)
conf.write_config_header('config.hpp')
conf.write_config_header('core/config.hpp')
def build(bld):
version(bld)
bld(features="subst",
name='version',
source='version.hpp.in',
target='version.hpp',
source='core/version.hpp.in',
target='core/version.hpp',
install_path=None,
VERSION_STRING=VERSION_BASE,
VERSION_BUILD=VERSION,
@@ -184,8 +184,8 @@ def build(bld):
excl=['core/logger*.cpp']),
use='version NDN_CXX BOOST LIBRT',
includes='. core',
export_includes='. core',
headers='common.hpp',
export_includes='.',
headers='core/common.hpp'
)
if bld.env['HAVE_CUSTOM_LOGGER']: