build+nsync+tests+docs: Fix compilation for boost 1.59, doxygen docs, and other fixes
Requires ndn-cxx:commit:e3e2505aa03e0b298e1a8dfc9876f1f8dafcaaba (ndn-cxx-0.4.0-beta2-11-ge3e2505)
or earlier commit.
Change-Id: I6ad359aa368b3346464f2aa74a1ab319fcd3ab7a
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index c8ecebb..c85d71b 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -1782,18 +1782,6 @@
XML_OUTPUT = xml
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD =
-
# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
# listings (including syntax highlighting and cross-referencing information) to
# the XML output. Note that enabling this will significantly increase the size
@@ -1928,7 +1916,18 @@
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-PREDEFINED =
+PREDEFINED = DOXYGEN=1 \
+ INIT_LOGGER(x)= \
+ BOOST_STATIC_ASSERT(x)= \
+ BOOST_CONCEPT_ASSERT(x)= \
+ BOOST_CONCEPT_REQUIRES(x)= \
+ DECL_OVERRIDE=override \
+ PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
+ PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
+ PROTECTED_WITH_TESTS_ELSE_PRIVATE=private \
+ VIRTUAL_WITH_TESTS \
+ DECL_CLASS_FINAL=final \
+ DECL_FINAL=final
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The