Browse Source

renaming: ndn-cpp to ndn-cpp-dev

Change-Id: Iff3e4ff53a0005b7dd35c57d03da76b347170d03
pull/1/head
Yingdi Yu 12 years ago committed by Alexander Afanasyev
parent
commit
61ec2726de
  1. 2
      .gitignore
  2. 12
      Makefile.am
  3. 4
      configure.ac
  4. 2
      examples/Makefile.am
  5. 2
      examples/consumer.cpp
  6. 4
      examples/producer.cpp
  7. 24
      include/Makefile.am
  8. 2
      include/ndn-cpp-dev/c/common.h
  9. 0
      include/ndn-cpp-dev/c/data-types.h
  10. 0
      include/ndn-cpp-dev/c/encoding/element-listener.h
  11. 0
      include/ndn-cpp-dev/c/forwarding-flags.h
  12. 0
      include/ndn-cpp-dev/c/interest-types.h
  13. 0
      include/ndn-cpp-dev/c/key-types.h
  14. 2
      include/ndn-cpp-dev/c/util/crypto.h
  15. 6
      include/ndn-cpp-dev/common.hpp
  16. 0
      include/ndn-cpp-dev/data.hpp
  17. 0
      include/ndn-cpp-dev/encoding/binary-xml-wire-format.hpp
  18. 0
      include/ndn-cpp-dev/encoding/block-helpers.hpp
  19. 2
      include/ndn-cpp-dev/encoding/block.hpp
  20. 2
      include/ndn-cpp-dev/encoding/buffer.hpp
  21. 0
      include/ndn-cpp-dev/encoding/element-listener.hpp
  22. 0
      include/ndn-cpp-dev/encoding/endian.h
  23. 0
      include/ndn-cpp-dev/encoding/oid.hpp
  24. 0
      include/ndn-cpp-dev/encoding/tlv-face-management.hpp
  25. 0
      include/ndn-cpp-dev/encoding/tlv.hpp
  26. 0
      include/ndn-cpp-dev/encoding/wire-format.hpp
  27. 0
      include/ndn-cpp-dev/exclude.hpp
  28. 0
      include/ndn-cpp-dev/face-instance.hpp
  29. 0
      include/ndn-cpp-dev/face.hpp
  30. 0
      include/ndn-cpp-dev/forwarding-entry.hpp
  31. 0
      include/ndn-cpp-dev/forwarding-flags.hpp
  32. 0
      include/ndn-cpp-dev/interest.hpp
  33. 0
      include/ndn-cpp-dev/key-locator.hpp
  34. 0
      include/ndn-cpp-dev/meta-info.hpp
  35. 0
      include/ndn-cpp-dev/name.hpp
  36. 0
      include/ndn-cpp-dev/node.hpp
  37. 0
      include/ndn-cpp-dev/security/certificate-extension.hpp
  38. 0
      include/ndn-cpp-dev/security/certificate-subject-description.hpp
  39. 0
      include/ndn-cpp-dev/security/certificate.hpp
  40. 0
      include/ndn-cpp-dev/security/encryption-manager.hpp
  41. 0
      include/ndn-cpp-dev/security/identity-certificate.hpp
  42. 0
      include/ndn-cpp-dev/security/key-chain.hpp
  43. 0
      include/ndn-cpp-dev/security/public-key.hpp
  44. 0
      include/ndn-cpp-dev/security/sec-policy-no-verify.hpp
  45. 0
      include/ndn-cpp-dev/security/sec-policy-self-verify.hpp
  46. 0
      include/ndn-cpp-dev/security/sec-policy.hpp
  47. 0
      include/ndn-cpp-dev/security/sec-public-info-memory.hpp
  48. 2
      include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp
  49. 0
      include/ndn-cpp-dev/security/sec-public-info.hpp
  50. 0
      include/ndn-cpp-dev/security/sec-tpm-memory.hpp
  51. 2
      include/ndn-cpp-dev/security/sec-tpm-osx.hpp
  52. 0
      include/ndn-cpp-dev/security/sec-tpm.hpp
  53. 0
      include/ndn-cpp-dev/security/security-common.hpp
  54. 0
      include/ndn-cpp-dev/security/security-exception.hpp
  55. 0
      include/ndn-cpp-dev/security/sha256-with-rsa-handler.hpp
  56. 0
      include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp
  57. 0
      include/ndn-cpp-dev/security/validation-request.hpp
  58. 0
      include/ndn-cpp-dev/security/verifier.hpp
  59. 0
      include/ndn-cpp-dev/signature.hpp
  60. 0
      include/ndn-cpp-dev/status-response.hpp
  61. 2
      include/ndn-cpp-dev/transport/transport.hpp
  62. 0
      include/ndn-cpp-dev/transport/unix-transport.hpp
  63. 0
      include/ndn-cpp-dev/util/blob.hpp
  64. 0
      include/ndn-cpp-dev/util/signed-blob.hpp
  65. 2
      src/c/data.h
  66. 2
      src/c/encoding/binary-xml-decoder.h
  67. 2
      src/c/encoding/binary-xml-element-reader.h
  68. 2
      src/c/encoding/binary-xml-structure-decoder.h
  69. 4
      src/c/forwarding-entry.h
  70. 2
      src/c/interest.h
  71. 2
      src/c/key-locator.h
  72. 2
      src/c/name.h
  73. 2
      src/c/publisher-public-key-digest.h
  74. 2
      src/c/transport/socket-transport.h
  75. 2
      src/c/util/blob.h
  76. 2
      src/c/util/crypto.c
  77. 2
      src/c/util/ndn_memory.h
  78. 2
      src/c/util/time.c
  79. 2
      src/c/util/time.h
  80. 2
      src/common.cpp
  81. 4
      src/data.cpp
  82. 2
      src/encoding/binary-xml-encoder.hpp
  83. 8
      src/encoding/binary-xml-wire-format.cpp
  84. 4
      src/encoding/block.cpp
  85. 2
      src/encoding/cryptopp/asn_ext.cpp
  86. 2
      src/encoding/cryptopp/asn_ext.hpp
  87. 2
      src/encoding/element-listener.cpp
  88. 2
      src/encoding/oid.cpp
  89. 2
      src/encoding/wire-format.cpp
  90. 2
      src/exclude.cpp
  91. 2
      src/face.cpp
  92. 4
      src/interest.cpp
  93. 2
      src/name.cpp
  94. 10
      src/node.cpp
  95. 2
      src/security/certificate-extension.cpp
  96. 2
      src/security/certificate-subject-description.cpp
  97. 4
      src/security/certificate.cpp
  98. 2
      src/security/identity-certificate.cpp
  99. 4
      src/security/public-key.cpp
  100. 2
      src/security/sec-policy-no-verify.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

2
.gitignore vendored

@ -24,7 +24,7 @@ config.log
/include/config.h
/_configs.sed
/stamp-h1
/include/ndn-cpp/ndn-cpp-config.h
/include/ndn-cpp-dev/ndn-cpp-config.h
/include/stamp-h1
/aclocal.m4
/libtool

12
Makefile.am

@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = subdir-objects
## to provide a way for the user to supply additional arguments.
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
lib_LTLIBRARIES = libndn-c.la libndn-cpp.la
lib_LTLIBRARIES = libndn-cpp-dev.la
# "make install" will also install the include headers.
SUBDIRS = include . tools examples
@ -81,7 +81,7 @@ libndn_c_la_CFLAGS = @OPENSSL_INCLUDES@
# C++ code and also the C code.
## To regenerate:
## for i in `find src -name '*.cpp' -or -name '*.hpp' -or -name '*.h' -and -not -path 'src/c/*'`; do echo " $i \\"; done
libndn_cpp_la_SOURCES = $(libndn_c_la_SOURCES) \
libndn_cpp_dev_la_SOURCES = $(libndn_c_la_SOURCES) \
src/common.cpp \
src/data.cpp \
src/encoding/binary-xml-decoder.hpp \
@ -124,13 +124,13 @@ libndn_cpp_la_SOURCES = $(libndn_c_la_SOURCES) \
src/util/time.hpp
if HAVE_OSX_SECURITY
libndn_cpp_la_SOURCES += src/security/sec-tpm-osx.cpp
libndn_cpp_dev_la_SOURCES += src/security/sec-tpm-osx.cpp
else
EXTRA_DIST = src/security/sec-tpm-osx.cpp
endif
libndn_cpp_la_LIBADD = @OPENSSL_LIBS@ @CRYPTOPP_LIBS@ @OSX_SECURITY_LIBS@ @BOOST_SYSTEM_LIB@
libndn_cpp_la_LDFLAGS = @OPENSSL_LDFLAGS@ @CRYPTOPP_LDFLAGS@ @SQLITE3_LDFLAGS@ @BOOST_LDFLAGS@
libndn_cpp_la_CFLAGS = @OPENSSL_INCLUDES@ @CRYPTOPP_INCLUDES@ @SQLITE3_CFLAGS@ @BOOST_CPPFLAGS@
libndn_cpp_dev_la_LIBADD = @OPENSSL_LIBS@ @CRYPTOPP_LIBS@ @OSX_SECURITY_LIBS@ @BOOST_SYSTEM_LIB@
libndn_cpp_dev_la_LDFLAGS = @OPENSSL_LDFLAGS@ @CRYPTOPP_LDFLAGS@ @SQLITE3_LDFLAGS@ @BOOST_LDFLAGS@
libndn_cpp_dev_la_CFLAGS = @OPENSSL_INCLUDES@ @CRYPTOPP_INCLUDES@ @SQLITE3_CFLAGS@ @BOOST_CPPFLAGS@
dist_noinst_SCRIPTS = autogen.sh

4
configure.ac

@ -1,7 +1,7 @@
# To build using autotools, see the Development section of the file INSTALL.
AC_PREREQ([2.59])
AC_INIT([ndn-cpp], [0.2], [ndn-lib@lists.cs.ucla.edu], [ndn-cpp], [https://github.com/named-data/ndn-cpp])
AC_INIT([ndn-cpp-dev], [0.2.1], [ndn-lib@lists.cs.ucla.edu], [ndn-cpp-dev], [https://github.com/named-data/ndn-cpp])
AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
AC_CONFIG_MACRO_DIR([m4])
@ -9,7 +9,7 @@ AC_CONFIG_SRCDIR([configure.ac])
# Create config.h without prefixes. Put it in the include directory so CFLAGS will have -I./include .
AC_CONFIG_HEADERS(include/config.h)
# Add prefixes and output to a unique file name which will go into the ndn-cpp include install directory.
AX_PREFIX_CONFIG_H(include/ndn-cpp/ndn-cpp-config.h)
AX_PREFIX_CONFIG_H(include/ndn-cpp-dev/ndn-cpp-config.h, ndn-cpp)
AM_MAINTAINER_MODE
AM_PROG_AR
AC_PROG_LIBTOOL

2
examples/Makefile.am

@ -1,5 +1,5 @@
LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@
noinst_PROGRAMS=consumer producer

2
examples/consumer.cpp

@ -5,7 +5,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/face.hpp>
#include <ndn-cpp-dev/face.hpp>
#include <stdexcept>
#if NDN_CPP_HAVE_CXX11

4
examples/producer.cpp

@ -5,9 +5,9 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/face.hpp>
#include <ndn-cpp-dev/face.hpp>
#include <ndn-cpp/security/key-chain.hpp>
#include <ndn-cpp-dev/security/key-chain.hpp>
#if NDN_CPP_HAVE_CXX11
// In the std library, the placeholders are in a different namespace than boost.

24
include/Makefile.am

@ -1,24 +1,24 @@
# "make install" will install these in the install include directory, for example
# /usr/local/ndn-cpp/name.hpp.
# /usr/local/ndn-cpp-dev/name.hpp.
# These files are included by the application with, for example
# #include <ndn-cpp/namp.hpp>
# #include <ndn-cpp-dev/namp.hpp>
# Internal include headers are not put in this public install directory.
# Public C headers.
ndn_cpp_c_headers = \
$(wildcard ndn-cpp/*.h) \
$(wildcard ndn-cpp/c/*.*) \
$(wildcard ndn-cpp/c/encoding/*.*) \
$(wildcard ndn-cpp/c/util/*.*)
$(wildcard ndn-cpp-dev/*.h) \
$(wildcard ndn-cpp-dev/c/*.*) \
$(wildcard ndn-cpp-dev/c/encoding/*.*) \
$(wildcard ndn-cpp-dev/c/util/*.*)
# Public C++ headers.
# Use ndn-cpp/*.hpp instead of *.* to not overwrite *.h from above.
# Use ndn-cpp-dev/*.hpp instead of *.* to not overwrite *.h from above.
ndn_cpp_cpp_headers = \
$(wildcard ndn-cpp/*.hpp) \
$(wildcard ndn-cpp/encoding/*.*) \
$(wildcard ndn-cpp/security/*.*) \
$(wildcard ndn-cpp/transport/*.*) \
$(wildcard ndn-cpp/util/*.*)
$(wildcard ndn-cpp-dev/*.hpp) \
$(wildcard ndn-cpp-dev/encoding/*.*) \
$(wildcard ndn-cpp-dev/security/*.*) \
$(wildcard ndn-cpp-dev/transport/*.*) \
$(wildcard ndn-cpp-dev/util/*.*)
ndnboost_headers = \
$(wildcard ndnboost/*.*) \

2
include/ndn-cpp/c/common.h → include/ndn-cpp-dev/c/common.h

@ -7,7 +7,7 @@
#ifndef NDN_COMMON_H
#define NDN_COMMON_H
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#include <stdint.h>
// TODO: Is stddef.h portable?
#include <stddef.h>

0
include/ndn-cpp/c/data-types.h → include/ndn-cpp-dev/c/data-types.h

0
include/ndn-cpp/c/encoding/element-listener.h → include/ndn-cpp-dev/c/encoding/element-listener.h

0
include/ndn-cpp/c/forwarding-flags.h → include/ndn-cpp-dev/c/forwarding-flags.h

0
include/ndn-cpp/c/interest-types.h → include/ndn-cpp-dev/c/interest-types.h

0
include/ndn-cpp/c/key-types.h → include/ndn-cpp-dev/c/key-types.h

2
include/ndn-cpp/c/util/crypto.h → include/ndn-cpp-dev/c/util/crypto.h

@ -9,7 +9,7 @@
#include <openssl/ssl.h>
#include <openssl/rsa.h>
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#ifdef __cplusplus
extern "C" {

6
include/ndn-cpp/common.hpp → include/ndn-cpp-dev/common.hpp

@ -15,7 +15,7 @@
#if NDN_CPP_HAVE_CXX11
#if (__cplusplus < 201103L)
#error "NDN-CPP library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
#error "NDN-CPP-DEV library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
#endif
// Depending on where ./configure found shared_ptr, define the ptr_lib namespace.
@ -43,8 +43,8 @@ namespace ndn { namespace func_lib = boost; }
#else // use embedded boost headers
/* Use the boost header files in this distribution that were extracted with:
cd <BOOST DEVELOPMENT DIRECTORY WITH boost SUBDIRECTORY>
dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP ROOT>/include
cd <NDN-CPP ROOT>/include
dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP-DEV ROOT>/include
cd <NDN-CPP-DEV ROOT>/include
rm -rf boost.css boost.png Jamroot libs
mv boost ndnboost
cd ndnboost

0
include/ndn-cpp/data.hpp → include/ndn-cpp-dev/data.hpp

0
include/ndn-cpp/encoding/binary-xml-wire-format.hpp → include/ndn-cpp-dev/encoding/binary-xml-wire-format.hpp

0
include/ndn-cpp/encoding/block-helpers.hpp → include/ndn-cpp-dev/encoding/block-helpers.hpp

2
include/ndn-cpp/encoding/block.hpp → include/ndn-cpp-dev/encoding/block.hpp

@ -10,7 +10,7 @@
#ifndef NDN_BLOCK_HPP
#define NDN_BLOCK_HPP
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <list>
#include <exception>

2
include/ndn-cpp/encoding/buffer.hpp → include/ndn-cpp-dev/encoding/buffer.hpp

@ -10,7 +10,7 @@
#ifndef NDN_BUFFER_HPP
#define NDN_BUFFER_HPP
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <boost/iostreams/detail/ios.hpp>
#include <boost/iostreams/categories.hpp>

0
include/ndn-cpp/encoding/element-listener.hpp → include/ndn-cpp-dev/encoding/element-listener.hpp

0
include/ndn-cpp/encoding/endian.h → include/ndn-cpp-dev/encoding/endian.h

0
include/ndn-cpp/encoding/oid.hpp → include/ndn-cpp-dev/encoding/oid.hpp

0
include/ndn-cpp/encoding/tlv-face-management.hpp → include/ndn-cpp-dev/encoding/tlv-face-management.hpp

0
include/ndn-cpp/encoding/tlv.hpp → include/ndn-cpp-dev/encoding/tlv.hpp

0
include/ndn-cpp/encoding/wire-format.hpp → include/ndn-cpp-dev/encoding/wire-format.hpp

0
include/ndn-cpp/exclude.hpp → include/ndn-cpp-dev/exclude.hpp

0
include/ndn-cpp/face-instance.hpp → include/ndn-cpp-dev/face-instance.hpp

0
include/ndn-cpp/face.hpp → include/ndn-cpp-dev/face.hpp

0
include/ndn-cpp/forwarding-entry.hpp → include/ndn-cpp-dev/forwarding-entry.hpp

0
include/ndn-cpp/forwarding-flags.hpp → include/ndn-cpp-dev/forwarding-flags.hpp

0
include/ndn-cpp/interest.hpp → include/ndn-cpp-dev/interest.hpp

0
include/ndn-cpp/key-locator.hpp → include/ndn-cpp-dev/key-locator.hpp

0
include/ndn-cpp/meta-info.hpp → include/ndn-cpp-dev/meta-info.hpp

0
include/ndn-cpp/name.hpp → include/ndn-cpp-dev/name.hpp

0
include/ndn-cpp/node.hpp → include/ndn-cpp-dev/node.hpp

0
include/ndn-cpp/security/certificate-extension.hpp → include/ndn-cpp-dev/security/certificate-extension.hpp

0
include/ndn-cpp/security/certificate-subject-description.hpp → include/ndn-cpp-dev/security/certificate-subject-description.hpp

0
include/ndn-cpp/security/certificate.hpp → include/ndn-cpp-dev/security/certificate.hpp

0
include/ndn-cpp/security/encryption-manager.hpp → include/ndn-cpp-dev/security/encryption-manager.hpp

0
include/ndn-cpp/security/identity-certificate.hpp → include/ndn-cpp-dev/security/identity-certificate.hpp

0
include/ndn-cpp/security/key-chain.hpp → include/ndn-cpp-dev/security/key-chain.hpp

0
include/ndn-cpp/security/public-key.hpp → include/ndn-cpp-dev/security/public-key.hpp

0
include/ndn-cpp/security/sec-policy-no-verify.hpp → include/ndn-cpp-dev/security/sec-policy-no-verify.hpp

0
include/ndn-cpp/security/sec-policy-self-verify.hpp → include/ndn-cpp-dev/security/sec-policy-self-verify.hpp

0
include/ndn-cpp/security/sec-policy.hpp → include/ndn-cpp-dev/security/sec-policy.hpp

0
include/ndn-cpp/security/sec-public-info-memory.hpp → include/ndn-cpp-dev/security/sec-public-info-memory.hpp

2
include/ndn-cpp/security/sec-public-info-sqlite3.hpp → include/ndn-cpp-dev/security/sec-public-info-sqlite3.hpp

@ -10,7 +10,7 @@
#define NDN_SEC_PUBLIC_INFO_SQLITE3_HPP
// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#ifdef NDN_CPP_HAVE_SQLITE3
#include <sqlite3.h>

0
include/ndn-cpp/security/sec-public-info.hpp → include/ndn-cpp-dev/security/sec-public-info.hpp

0
include/ndn-cpp/security/sec-tpm-memory.hpp → include/ndn-cpp-dev/security/sec-tpm-memory.hpp

2
include/ndn-cpp/security/sec-tpm-osx.hpp → include/ndn-cpp-dev/security/sec-tpm-osx.hpp

@ -9,7 +9,7 @@
#define NDN_SEC_TPM_OSX_HPP
// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECURITY 1.
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#if NDN_CPP_HAVE_OSX_SECURITY
#include "../common.hpp"

0
include/ndn-cpp/security/sec-tpm.hpp → include/ndn-cpp-dev/security/sec-tpm.hpp

0
include/ndn-cpp/security/security-common.hpp → include/ndn-cpp-dev/security/security-common.hpp

0
include/ndn-cpp/security/security-exception.hpp → include/ndn-cpp-dev/security/security-exception.hpp

0
include/ndn-cpp/security/sha256-with-rsa-handler.hpp → include/ndn-cpp-dev/security/sha256-with-rsa-handler.hpp

0
include/ndn-cpp/security/signature-sha256-with-rsa.hpp → include/ndn-cpp-dev/security/signature-sha256-with-rsa.hpp

0
include/ndn-cpp/security/validation-request.hpp → include/ndn-cpp-dev/security/validation-request.hpp

0
include/ndn-cpp/security/verifier.hpp → include/ndn-cpp-dev/security/verifier.hpp

0
include/ndn-cpp/signature.hpp → include/ndn-cpp-dev/signature.hpp

0
include/ndn-cpp/status-response.hpp → include/ndn-cpp-dev/status-response.hpp

2
include/ndn-cpp/transport/transport.hpp → include/ndn-cpp-dev/transport/transport.hpp

@ -8,7 +8,7 @@
#ifndef NDN_TRANSPORT_HPP
#define NDN_TRANSPORT_HPP
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <vector>
#include <boost/asio.hpp>

0
include/ndn-cpp/transport/unix-transport.hpp → include/ndn-cpp-dev/transport/unix-transport.hpp

0
include/ndn-cpp/util/blob.hpp → include/ndn-cpp-dev/util/blob.hpp

0
include/ndn-cpp/util/signed-blob.hpp → include/ndn-cpp-dev/util/signed-blob.hpp

2
src/c/data.h

@ -7,7 +7,7 @@
#ifndef NDN_DATA_H
#define NDN_DATA_H
#include <ndn-cpp/c/data-types.h>
#include <ndn-cpp-dev/c/data-types.h>
#include "name.h"
#include "publisher-public-key-digest.h"
#include "key-locator.h"

2
src/c/encoding/binary-xml-decoder.h

@ -7,7 +7,7 @@
#ifndef NDN_BINARYXMLDECODER_H
#define NDN_BINARYXMLDECODER_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#include "../util/blob.h"

2
src/c/encoding/binary-xml-element-reader.h

@ -7,7 +7,7 @@
#ifndef NDN_BINARY_XML_ELEMENT_READER_H
#define NDN_BINARY_XML_ELEMENT_READER_H
#include <ndn-cpp/c/encoding/element-listener.h>
#include <ndn-cpp-dev/c/encoding/element-listener.h>
#include "../errors.h"
#include "binary-xml-structure-decoder.h"
#include "../util/dynamic-uint8-array.h"

2
src/c/encoding/binary-xml-structure-decoder.h

@ -7,7 +7,7 @@
#ifndef NDN_BINARYXMLSTRUCTUREDECODER_H
#define NDN_BINARYXMLSTRUCTUREDECODER_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#ifdef __cplusplus

4
src/c/forwarding-entry.h

@ -7,8 +7,8 @@
#ifndef NDN_FORWARDING_ENTRY_H
#define NDN_FORWARDING_ENTRY_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp/c/forwarding-flags.h>
#include <ndn-cpp-dev/c/common.h>
#include <ndn-cpp-dev/c/forwarding-flags.h>
#include "name.h"
#include "publisher-public-key-digest.h"

2
src/c/interest.h

@ -7,7 +7,7 @@
#ifndef NDN_INTEREST_H
#define NDN_INTEREST_H
#include <ndn-cpp/c/interest-types.h>
#include <ndn-cpp-dev/c/interest-types.h>
#include "name.h"
#include "publisher-public-key-digest.h"

2
src/c/key-locator.h

@ -7,7 +7,7 @@
#ifndef NDN_KEY_LOCATOR_H
#define NDN_KEY_LOCATOR_H
#include <ndn-cpp/c/key-types.h>
#include <ndn-cpp-dev/c/key-types.h>
#include "name.h"
#ifdef __cplusplus

2
src/c/name.h

@ -7,7 +7,7 @@
#ifndef NDN_NAME_H
#define NDN_NAME_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "errors.h"
#include "util/blob.h"

2
src/c/publisher-public-key-digest.h

@ -7,7 +7,7 @@
#ifndef NDN_PUBLISHERPUBLICKEYDIGEST_H
#define NDN_PUBLISHERPUBLICKEYDIGEST_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "util/blob.h"
#ifdef __cplusplus

2
src/c/transport/socket-transport.h

@ -8,7 +8,7 @@
#define NDN_SOCKETTRANSPORT_H
#include <sys/socket.h>
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#ifdef __cplusplus

2
src/c/util/blob.h

@ -7,7 +7,7 @@
#ifndef NDN_BLOB_H
#define NDN_BLOB_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#ifdef __cplusplus
extern "C" {

2
src/c/util/crypto.c

@ -4,7 +4,7 @@
* See COPYING for copyright and distribution information.
*/
#include "ndn-cpp/c/util/crypto.h"
#include "ndn-cpp-dev/c/util/crypto.h"
void ndn_digestSha256(const uint8_t *data, size_t dataLength, uint8_t *digest)
{

2
src/c/util/ndn_memory.h

@ -11,7 +11,7 @@
#ifndef NDN_MEMORY_H
#define NDN_MEMORY_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#ifdef __cplusplus
extern "C" {

2
src/c/util/time.c

@ -4,7 +4,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#if NDN_CPP_HAVE_TIME_H
#include <time.h>
#endif

2
src/c/util/time.h

@ -7,7 +7,7 @@
#ifndef NDN_TIME_H
#define NDN_TIME_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#ifdef __cplusplus

2
src/common.cpp

@ -6,7 +6,7 @@
*/
#include <sstream>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#if NDN_CPP_HAVE_TIME_H
#include <time.h>

4
src/data.cpp

@ -5,8 +5,8 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/common.hpp>
#include <ndn-cpp/data.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp-dev/data.hpp>
using namespace std;

2
src/encoding/binary-xml-encoder.hpp

@ -9,7 +9,7 @@
#define NDN_BINARYXMLENCODER_HPP
#include <vector>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include "../util/dynamic-uint8-vector.hpp"
#include "../c/encoding/binary-xml-encoder.h"

8
src/encoding/binary-xml-wire-format.cpp

@ -6,10 +6,10 @@
*/
#include <stdexcept>
#include <ndn-cpp/interest.hpp>
#include <ndn-cpp/data.hpp>
#include <ndn-cpp/forwarding-entry.hpp>
#include <ndn-cpp/encoding/binary-xml-wire-format.hpp>
#include <ndn-cpp-dev/interest.hpp>
#include <ndn-cpp-dev/data.hpp>
#include <ndn-cpp-dev/forwarding-entry.hpp>
#include <ndn-cpp-dev/encoding/binary-xml-wire-format.hpp>
#include "../c/encoding/binary-xml-interest.h"
#include "../c/encoding/binary-xml-data.h"
#include "../c/encoding/binary-xml-forwarding-entry.h"

4
src/encoding/block.cpp

@ -7,8 +7,8 @@
* Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
#include <ndn-cpp/encoding/block.hpp>
#include <ndn-cpp/encoding/tlv.hpp>
#include <ndn-cpp-dev/encoding/block.hpp>
#include <ndn-cpp-dev/encoding/tlv.hpp>
namespace ndn {

2
src/encoding/cryptopp/asn_ext.cpp

@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#include "asn_ext.hpp"
#if NDN_CPP_HAVE_TIME_H

2
src/encoding/cryptopp/asn_ext.hpp

@ -23,7 +23,7 @@
#endif
#include <stdexcept>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <cryptopp/asn.h>
namespace ndn {

2
src/encoding/element-listener.cpp

@ -5,7 +5,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/encoding/element-listener.hpp>
#include <ndn-cpp-dev/encoding/element-listener.hpp>
namespace ndn {

2
src/encoding/oid.cpp

@ -21,7 +21,7 @@
#include <stdlib.h>
#include <sstream>
#include <ndn-cpp/encoding/oid.hpp>
#include <ndn-cpp-dev/encoding/oid.hpp>
#include <cryptopp/asn.h>
using namespace std;

2
src/encoding/wire-format.cpp

@ -6,7 +6,7 @@
*/
#include <stdexcept>
#include <ndn-cpp/encoding/wire-format.hpp>
#include <ndn-cpp-dev/encoding/wire-format.hpp>
using namespace std;

2
src/exclude.cpp

@ -8,7 +8,7 @@
* Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
#include <ndn-cpp/exclude.hpp>
#include <ndn-cpp-dev/exclude.hpp>
namespace ndn
{

2
src/face.cpp

@ -5,7 +5,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/face.hpp>
#include <ndn-cpp-dev/face.hpp>
using namespace std;

4
src/interest.cpp

@ -6,8 +6,8 @@
*/
#include <stdexcept>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp/interest.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp-dev/interest.hpp>
#if __clang__
#pragma clang diagnostic push

2
src/name.cpp

@ -9,7 +9,7 @@
#include <stdexcept>
#include <algorithm>
#include <string.h>
#include <ndn-cpp/name.hpp>
#include <ndn-cpp-dev/name.hpp>
#include "c/util/ndn_memory.h"
#include "c/util/time.h"

10
src/node.cpp

@ -8,14 +8,14 @@
#include <stdexcept>
#include "c/util/time.h"
#include <ndn-cpp/forwarding-entry.hpp>
#include <ndn-cpp/face-instance.hpp>
#include <ndn-cpp/node.hpp>
#include <ndn-cpp-dev/forwarding-entry.hpp>
#include <ndn-cpp-dev/face-instance.hpp>
#include <ndn-cpp-dev/node.hpp>
#include "util/ndnd-id-fetcher.hpp"
#include <ndn-cpp/security/signature-sha256-with-rsa.hpp>
#include <ndn-cpp/status-response.hpp>
#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
#include <ndn-cpp-dev/status-response.hpp>
using namespace std;
#if NDN_CPP_HAVE_CXX11

2
src/security/certificate-extension.cpp

@ -18,7 +18,7 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/security/certificate-extension.hpp>
#include <ndn-cpp-dev/security/certificate-extension.hpp>
#include <cryptopp/asn.h>
using namespace std;

2
src/security/certificate-subject-description.cpp

@ -18,7 +18,7 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/security/certificate-subject-description.hpp>
#include <ndn-cpp-dev/security/certificate-subject-description.hpp>
#include <cryptopp/asn.h>
using namespace std;

4
src/security/certificate.cpp

@ -18,9 +18,9 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp/security/certificate.hpp>
#include <ndn-cpp-dev/security/certificate.hpp>
#include "../util/logging.hpp"
#include "../util/time.hpp"

2
src/security/identity-certificate.cpp

@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/security/identity-certificate.hpp>
#include <ndn-cpp-dev/security/identity-certificate.hpp>
using namespace std;

4
src/security/public-key.cpp

@ -18,8 +18,8 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/common.hpp>
#include <ndn-cpp/security/public-key.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp-dev/security/public-key.hpp>
#include <cryptopp/rsa.h>
#include <cryptopp/base64.h>

2
src/security/sec-policy-no-verify.cpp

@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/security/sec-policy-no-verify.hpp>
#include <ndn-cpp-dev/security/sec-policy-no-verify.hpp>
using namespace std;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save