Major update to rename ContentObject to Data everywhere.
diff --git a/Makefile.in b/Makefile.in
index 634aa7c..457f6d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,7 +86,7 @@
$(dist_noinst_SCRIPTS) depcomp COPYING ar-lib compile \
config.guess config.sub install-sh missing ltmain.sh
bin_PROGRAMS = bin/test-encode-decode-Interest$(EXEEXT) \
- bin/test-encode-decode-ContentObject$(EXEEXT) \
+ bin/test-encode-decode-data$(EXEEXT) \
bin/test-get-async$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -137,7 +137,7 @@
libndn_c_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am_libndn_c_a_OBJECTS = ndn-cpp/c/errors.$(OBJEXT) \
- ndn-cpp/c/encoding/BinaryXMLContentObject.$(OBJEXT) \
+ ndn-cpp/c/encoding/binary-xml-data.$(OBJEXT) \
ndn-cpp/c/encoding/BinaryXMLDecoder.$(OBJEXT) \
ndn-cpp/c/encoding/BinaryXMLElementReader.$(OBJEXT) \
ndn-cpp/c/encoding/BinaryXMLEncoder.$(OBJEXT) \
@@ -153,7 +153,7 @@
libndn_c_a_OBJECTS = $(am_libndn_c_a_OBJECTS)
libndn_cpp_a_AR = $(AR) $(ARFLAGS)
libndn_cpp_a_LIBADD =
-am_libndn_cpp_a_OBJECTS = ndn-cpp/ContentObject.$(OBJEXT) \
+am_libndn_cpp_a_OBJECTS = ndn-cpp/data.$(OBJEXT) \
ndn-cpp/Interest.$(OBJEXT) ndn-cpp/Key.$(OBJEXT) \
ndn-cpp/NDN.$(OBJEXT) ndn-cpp/Name.$(OBJEXT) \
ndn-cpp/encoding/BinaryXMLElementReader.$(OBJEXT) \
@@ -164,17 +164,16 @@
ndn-cpp/transport/UdpTransport.$(OBJEXT)
libndn_cpp_a_OBJECTS = $(am_libndn_cpp_a_OBJECTS)
PROGRAMS = $(bin_PROGRAMS)
-am_bin_test_encode_decode_ContentObject_OBJECTS = \
- tests/test-encode-decode-ContentObject.$(OBJEXT)
-bin_test_encode_decode_ContentObject_OBJECTS = \
- $(am_bin_test_encode_decode_ContentObject_OBJECTS)
-bin_test_encode_decode_ContentObject_DEPENDENCIES = libndn-c.a \
- libndn-cpp.a
am_bin_test_encode_decode_Interest_OBJECTS = \
tests/test-encode-decode-Interest.$(OBJEXT)
bin_test_encode_decode_Interest_OBJECTS = \
$(am_bin_test_encode_decode_Interest_OBJECTS)
bin_test_encode_decode_Interest_DEPENDENCIES = libndn-c.a libndn-cpp.a
+am_bin_test_encode_decode_data_OBJECTS = \
+ tests/test-encode-decode-data.$(OBJEXT)
+bin_test_encode_decode_data_OBJECTS = \
+ $(am_bin_test_encode_decode_data_OBJECTS)
+bin_test_encode_decode_data_DEPENDENCIES = libndn-c.a libndn-cpp.a
am_bin_test_get_async_OBJECTS = tests/test-get-async.$(OBJEXT)
bin_test_get_async_OBJECTS = $(am_bin_test_get_async_OBJECTS)
bin_test_get_async_DEPENDENCIES = libndn-c.a libndn-cpp.a
@@ -221,12 +220,12 @@
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
SOURCES = $(libndn_c_a_SOURCES) $(libndn_cpp_a_SOURCES) \
- $(bin_test_encode_decode_ContentObject_SOURCES) \
$(bin_test_encode_decode_Interest_SOURCES) \
+ $(bin_test_encode_decode_data_SOURCES) \
$(bin_test_get_async_SOURCES)
DIST_SOURCES = $(libndn_c_a_SOURCES) $(libndn_cpp_a_SOURCES) \
- $(bin_test_encode_decode_ContentObject_SOURCES) \
$(bin_test_encode_decode_Interest_SOURCES) \
+ $(bin_test_encode_decode_data_SOURCES) \
$(bin_test_get_async_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
@@ -417,14 +416,14 @@
lib_LIBRARIES = libndn-c.a libndn-cpp.a
libndn_c_a_SOURCES = \
config.h \
- ndn-cpp/c/ContentObject.h \
+ ndn-cpp/c/data.h \
ndn-cpp/c/Interest.h \
ndn-cpp/c/Key.h \
ndn-cpp/c/Name.h \
ndn-cpp/c/PublisherPublicKeyDigest.h \
ndn-cpp/c/errors.c ndn-cpp/c/errors.h \
ndn-cpp/c/encoding/BinaryXML.h \
- ndn-cpp/c/encoding/BinaryXMLContentObject.c ndn-cpp/c/encoding/BinaryXMLContentObject.h \
+ ndn-cpp/c/encoding/binary-xml-data.c ndn-cpp/c/encoding/binary-xml-data.h \
ndn-cpp/c/encoding/BinaryXMLDecoder.c ndn-cpp/c/encoding/BinaryXMLDecoder.h \
ndn-cpp/c/encoding/BinaryXMLElementReader.c ndn-cpp/c/encoding/BinaryXMLElementReader.h \
ndn-cpp/c/encoding/BinaryXMLEncoder.c ndn-cpp/c/encoding/BinaryXMLEncoder.h \
@@ -443,7 +442,7 @@
libndn_cpp_a_SOURCES = \
config.h ndn-cpp/common.hpp \
ndn-cpp/Closure.hpp \
- ndn-cpp/ContentObject.cpp ndn-cpp/c/ContentObject.h ndn-cpp/ContentObject.hpp \
+ ndn-cpp/data.cpp ndn-cpp/c/data.h ndn-cpp/data.hpp \
ndn-cpp/Interest.cpp ndn-cpp/c/Interest.h ndn-cpp/Interest.hpp \
ndn-cpp/Key.cpp ndn-cpp/c/Key.h ndn-cpp/Key.hpp \
ndn-cpp/NDN.cpp ndn-cpp/NDN.hpp \
@@ -462,8 +461,8 @@
bin_test_encode_decode_Interest_SOURCES = tests/test-encode-decode-Interest.cpp
bin_test_encode_decode_Interest_LDADD = libndn-c.a libndn-cpp.a
-bin_test_encode_decode_ContentObject_SOURCES = tests/test-encode-decode-ContentObject.cpp
-bin_test_encode_decode_ContentObject_LDADD = libndn-c.a libndn-cpp.a
+bin_test_encode_decode_data_SOURCES = tests/test-encode-decode-data.cpp
+bin_test_encode_decode_data_LDADD = libndn-c.a libndn-cpp.a
bin_test_get_async_SOURCES = tests/test-get-async.cpp
bin_test_get_async_LDADD = libndn-c.a libndn-cpp.a
dist_noinst_SCRIPTS = autogen.sh
@@ -567,7 +566,7 @@
ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) ndn-cpp/c/encoding/$(DEPDIR)
@: > ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/c/encoding/BinaryXMLContentObject.$(OBJEXT): \
+ndn-cpp/c/encoding/binary-xml-data.$(OBJEXT): \
ndn-cpp/c/encoding/$(am__dirstamp) \
ndn-cpp/c/encoding/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/c/encoding/BinaryXMLDecoder.$(OBJEXT): \
@@ -627,7 +626,7 @@
ndn-cpp/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) ndn-cpp/$(DEPDIR)
@: > ndn-cpp/$(DEPDIR)/$(am__dirstamp)
-ndn-cpp/ContentObject.$(OBJEXT): ndn-cpp/$(am__dirstamp) \
+ndn-cpp/data.$(OBJEXT): ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
ndn-cpp/Interest.$(OBJEXT): ndn-cpp/$(am__dirstamp) \
ndn-cpp/$(DEPDIR)/$(am__dirstamp)
@@ -720,21 +719,21 @@
tests/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) tests/$(DEPDIR)
@: > tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-encode-decode-ContentObject.$(OBJEXT): \
- tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
+tests/test-encode-decode-Interest.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
bin/$(am__dirstamp):
@$(MKDIR_P) bin
@: > bin/$(am__dirstamp)
-bin/test-encode-decode-ContentObject$(EXEEXT): $(bin_test_encode_decode_ContentObject_OBJECTS) $(bin_test_encode_decode_ContentObject_DEPENDENCIES) $(EXTRA_bin_test_encode_decode_ContentObject_DEPENDENCIES) bin/$(am__dirstamp)
- @rm -f bin/test-encode-decode-ContentObject$(EXEEXT)
- $(AM_V_CXXLD)$(CXXLINK) $(bin_test_encode_decode_ContentObject_OBJECTS) $(bin_test_encode_decode_ContentObject_LDADD) $(LIBS)
-tests/test-encode-decode-Interest.$(OBJEXT): tests/$(am__dirstamp) \
- tests/$(DEPDIR)/$(am__dirstamp)
-
bin/test-encode-decode-Interest$(EXEEXT): $(bin_test_encode_decode_Interest_OBJECTS) $(bin_test_encode_decode_Interest_DEPENDENCIES) $(EXTRA_bin_test_encode_decode_Interest_DEPENDENCIES) bin/$(am__dirstamp)
@rm -f bin/test-encode-decode-Interest$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(bin_test_encode_decode_Interest_OBJECTS) $(bin_test_encode_decode_Interest_LDADD) $(LIBS)
+tests/test-encode-decode-data.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
+
+bin/test-encode-decode-data$(EXEEXT): $(bin_test_encode_decode_data_OBJECTS) $(bin_test_encode_decode_data_DEPENDENCIES) $(EXTRA_bin_test_encode_decode_data_DEPENDENCIES) bin/$(am__dirstamp)
+ @rm -f bin/test-encode-decode-data$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(bin_test_encode_decode_data_OBJECTS) $(bin_test_encode_decode_data_LDADD) $(LIBS)
tests/test-get-async.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
@@ -756,13 +755,12 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/ContentObject.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/Interest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/Key.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/NDN.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/Name.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/$(DEPDIR)/data.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/$(DEPDIR)/errors.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLContentObject.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLDecoder.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLElementReader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLEncoder.Po@am__quote@
@@ -771,6 +769,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLName.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLPublisherPublicKeyDigest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/BinaryXMLStructureDecoder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/encoding/$(DEPDIR)/binary-xml-data.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/transport/$(DEPDIR)/SocketTransport.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/util/$(DEPDIR)/DynamicUCharArray.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/c/util/$(DEPDIR)/ndn_memory.Po@am__quote@
@@ -781,8 +780,8 @@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/TcpTransport.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/Transport.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ndn-cpp/transport/$(DEPDIR)/UdpTransport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-ContentObject.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-Interest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-encode-decode-data.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-get-async.Po@am__quote@
.c.o: