From 6535943183c46d5a95787cf9c4bce609b634347c Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 13 Mar 2016 12:22:17 +0300 Subject: [PATCH] Docfix --- cds/intrusive/details/skip_list_base.h | 2 +- cds/intrusive/impl/skip_list.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cds/intrusive/details/skip_list_base.h b/cds/intrusive/details/skip_list_base.h index 4c050165..7a18b503 100644 --- a/cds/intrusive/details/skip_list_base.h +++ b/cds/intrusive/details/skip_list_base.h @@ -551,7 +551,7 @@ namespace cds { namespace intrusive { /// Item counter /** The type for item counting feature. - By default, item counting is disabled (\p atomicity::empty_item_counter) + By default, item counting is disabled (\p atomicity::empty_item_counter), \p atomicity::item_counter enables it. */ typedef atomicity::empty_item_counter item_counter; diff --git a/cds/intrusive/impl/skip_list.h b/cds/intrusive/impl/skip_list.h index fee5547b..5fd0545f 100644 --- a/cds/intrusive/impl/skip_list.h +++ b/cds/intrusive/impl/skip_list.h @@ -391,6 +391,11 @@ namespace cds { namespace intrusive { static unsigned int const c_nMinHeight = 5; //@endcond + // c_nMaxHeight * 2 - pPred/pSucc guards + // + 1 - for erase, unlink + // + 1 - for clear + static size_t const c_nHazardPtrCount = c_nMaxHeight * 2 + 2; ///< Count of hazard pointer required for the skip-list + protected: typedef typename node_type::atomic_marked_ptr atomic_node_ptr; ///< Atomic marked node pointer typedef typename node_type::marked_ptr marked_node_ptr; ///< Node marked pointer @@ -407,10 +412,6 @@ namespace cds { namespace intrusive { typedef std::unique_ptr< node_type, typename node_builder::node_disposer > scoped_node_ptr; - // c_nMaxHeight * 2 - pPred/pSucc guards - // + 1 - for erase, unlink - // + 1 - for clear - static size_t const c_nHazardPtrCount = c_nMaxHeight * 2 + 2; struct position { node_type * pPrev[ c_nMaxHeight ]; node_type * pSucc[ c_nMaxHeight ]; -- 2.34.1