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
2016-08-05 03:54:28 +00:00
parent 38f4ce9f25
commit 9f5b01dfd8
51 changed files with 129 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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>