Add "PSYNC_" prefix to access specifier macros to avoid conflicts
Also, sync boost.py waf tool with ndn-cxx
Change-Id: I75ed79725706313c3e64913de0fac17e2c182b8c
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 95b2bbe..1c819d0 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -2050,12 +2050,11 @@
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
PREDEFINED = DOXYGEN \
- PSYNC_PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
NDN_CXX_DECLARE_WIRE_ENCODE_INSTANTIATIONS(x)= \
- NDN_LOG_INIT(x)= \
- PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
- PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
- PROTECTED_WITH_TESTS_ELSE_PRIVATE=private
+ PSYNC_PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
+ PSYNC_PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
+ PSYNC_PROTECTED_WITH_TESTS_ELSE_PRIVATE=private \
+ PSYNC_VIRTUAL_WITH_TESTS
# 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