From 1859c038be08b288b7b754fb71d4e834cc9decb5 Mon Sep 17 00:00:00 2001 From: Bhumit Attarde Date: Mon, 26 Sep 2022 22:06:32 +0530 Subject: [PATCH 1/2] build(doxy): don't extract private members --- cmake/templates/conf.py.in | 3 ++- .../include/hpx/synchronization/condition_variable.hpp | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmake/templates/conf.py.in b/cmake/templates/conf.py.in index 7392b345fc6d..65ab8d053d5c 100644 --- a/cmake/templates/conf.py.in +++ b/cmake/templates/conf.py.in @@ -206,7 +206,8 @@ breathe_doxygen_config_options = { 'MACRO_EXPANSION': 'YES', 'DIRECTORY_GRAPH': 'NO', 'PREDEFINED': '@doxygen_definitions@', - 'STRIP_FROM_PATH': hpx_source_dir + 'STRIP_FROM_PATH': hpx_source_dir, + 'EXTRACT_PRIVATE': 'NO' } numfig = True diff --git a/libs/core/synchronization/include/hpx/synchronization/condition_variable.hpp b/libs/core/synchronization/include/hpx/synchronization/condition_variable.hpp index ddeb5548ee3f..1e35d05df747 100644 --- a/libs/core/synchronization/include/hpx/synchronization/condition_variable.hpp +++ b/libs/core/synchronization/include/hpx/synchronization/condition_variable.hpp @@ -100,12 +100,10 @@ namespace hpx { class condition_variable { private: - /// \cond NOPRIVATE using mutex_type = lcos::local::detail::condition_variable_data::mutex_type; using data_type = hpx::intrusive_ptr; - /// \endcond NOPRIVATE public: /// \brief Construct an object of type \a hpx::condition_variable. @@ -498,9 +496,7 @@ namespace hpx { } private: - /// \cond NOPRIVATE hpx::util::cache_aligned_data_derived data_; - /// \endcond NOPRIVATE }; /// @@ -518,12 +514,11 @@ namespace hpx { class condition_variable_any { private: - /// \cond NOPRIVATE using mutex_type = lcos::local::detail::condition_variable_data::mutex_type; using data_type = hpx::intrusive_ptr; - /// \endcond NOPRIVATE + public: /// /// \brief Constructs an object of type \a hpx::condition_variable_any @@ -1237,9 +1232,7 @@ namespace hpx { } private: - /// \cond NOPRIVATE hpx::util::cache_aligned_data_derived data_; - /// \endcond NOPRIVATE }; } // namespace hpx From 67558b6476d4dc7d97d400dc1ea64e58d9c24c03 Mon Sep 17 00:00:00 2001 From: Bhumit Attarde Date: Thu, 6 Oct 2022 21:13:15 +0530 Subject: [PATCH 2/2] fix(build): syntax error in sphinx file --- cmake/templates/conf.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/templates/conf.py.in b/cmake/templates/conf.py.in index 4f004259e689..fee8b6e4bbc7 100644 --- a/cmake/templates/conf.py.in +++ b/cmake/templates/conf.py.in @@ -207,7 +207,7 @@ breathe_doxygen_config_options = { 'DIRECTORY_GRAPH': 'NO', 'PREDEFINED': '@doxygen_definitions@', 'STRIP_FROM_PATH': hpx_source_dir, - 'EXTRACT_PRIVATE': 'NO' + 'EXTRACT_PRIVATE': 'NO', 'ALIASES': r'namedrequirement{1}="\1"' }