Merge branch 'dev'

[libcds.git] / doxygen / cds.doxy

diff --git a/doxygen/cds.doxy b/doxygen/cds.doxy
index cf679bfa8dec4896902fb034e254ab25e5f6470e..bebbae6e628ec765007cdfff49e656bee07b4412 100644 (file)
--- a/doxygen/cds.doxy
+++ b/doxygen/cds.doxy
@@ -31,7 +31,7 @@ PROJECT_NAME           = cds
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.0.0
+PROJECT_NUMBER         = 2.1.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -1394,17 +1394,12 @@ INCLUDE_FILE_PATTERNS  =
 
 PREDEFINED             = CDS_BUILD_BITS=64 \
                          CDS_DOXYGEN_INVOKED \
-                         cds_std=std \
                          CDS_URCU_SIGNAL_HANDLING_ENABLED \
                          CDS_CXX11_INLINE_NAMESPACE_SUPPORT \
                          CDS_CXX11_INLINE_NAMESPACE=inline \
-                         CDS_CXX11_DECLTYPE_SUPPORT \
                          CDS_NOEXCEPT=noexcept() \
                          CDS_CONSTEXPR=constexpr \
-                         CDS_CONSTEXPR_CONST="constexpr const" \
-                         CDS_ATOMIC=std \
-                         CDS_DELETE_SPECIFIER="=delete"\
-                         CDS_DEFAULT_SPECIFIER="=default"
+                         CDS_CXX11_INHERITING_CTOR
 
 # 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.