From 6d378dfd7f930f50b21ed0df9c53e2c764c3ea90 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 27 Jun 2015 19:37:34 +0300 Subject: [PATCH] Renamed m_nHazardPtrCount to c_nHazardPtrCount --- cds/container/segmented_queue.h | 2 +- cds/intrusive/basket_queue.h | 2 +- cds/intrusive/msqueue.h | 2 +- cds/intrusive/optimistic_queue.h | 4 ++-- cds/intrusive/segmented_queue.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cds/container/segmented_queue.h b/cds/container/segmented_queue.h index 6c606221..ce75b2ef 100644 --- a/cds/container/segmented_queue.h +++ b/cds/container/segmented_queue.h @@ -197,7 +197,7 @@ namespace cds { namespace container { typedef typename base_class::lock_type lock_type ; ///< Type of mutex for maintaining an internal list of allocated segments. typedef typename base_class::permutation_generator permutation_generator; ///< Random permutation generator for sequence [0, quasi-factor) - static const size_t m_nHazardPtrCount = base_class::m_nHazardPtrCount ; ///< Count of hazard pointer required for the algorithm + static const size_t c_nHazardPtrCount = base_class::c_nHazardPtrCount ; ///< Count of hazard pointer required for the algorithm protected: //@cond diff --git a/cds/intrusive/basket_queue.h b/cds/intrusive/basket_queue.h index 6fc8b81b..f30fb8a8 100644 --- a/cds/intrusive/basket_queue.h +++ b/cds/intrusive/basket_queue.h @@ -427,7 +427,7 @@ namespace cds { namespace intrusive { typedef BasketQueue< GC2, T2, Traits2> other ; ///< Rebinding result }; - static CDS_CONSTEXPR const size_t m_nHazardPtrCount = 6 ; ///< Count of hazard pointer required for the algorithm + static CDS_CONSTEXPR const size_t c_nHazardPtrCount = 6 ; ///< Count of hazard pointer required for the algorithm protected: //@cond diff --git a/cds/intrusive/msqueue.h b/cds/intrusive/msqueue.h index 9bd71f5d..2890e126 100644 --- a/cds/intrusive/msqueue.h +++ b/cds/intrusive/msqueue.h @@ -337,7 +337,7 @@ namespace cds { namespace intrusive { typedef MSQueue< GC2, T2, Traits2 > other; ///< Rebinding result }; - static CDS_CONSTEXPR const size_t m_nHazardPtrCount = 2; ///< Count of hazard pointer required for the algorithm + static CDS_CONSTEXPR const size_t c_nHazardPtrCount = 2; ///< Count of hazard pointer required for the algorithm protected: //@cond diff --git a/cds/intrusive/optimistic_queue.h b/cds/intrusive/optimistic_queue.h index a3ce3fa2..aba66db3 100644 --- a/cds/intrusive/optimistic_queue.h +++ b/cds/intrusive/optimistic_queue.h @@ -29,13 +29,13 @@ namespace cds { namespace intrusive { typedef typename gc::template atomic_ref atomic_node_ptr ; ///< atomic pointer - atomic_node_ptr m_pPrev ; ///< Pointer to previous node atomic_node_ptr m_pNext ; ///< Pointer to next node + atomic_node_ptr m_pPrev ; ///< Pointer to previous node node() CDS_NOEXCEPT { - m_pPrev.store( nullptr, atomics::memory_order_release ); m_pNext.store( nullptr, atomics::memory_order_release ); + m_pPrev.store( nullptr, atomics::memory_order_release ); } }; diff --git a/cds/intrusive/segmented_queue.h b/cds/intrusive/segmented_queue.h index a84948a9..e707cc17 100644 --- a/cds/intrusive/segmented_queue.h +++ b/cds/intrusive/segmented_queue.h @@ -211,7 +211,7 @@ namespace cds { namespace intrusive { typedef typename traits::lock_type lock_type; ///< Type of mutex for maintaining an internal list of allocated segments. typedef typename traits::permutation_generator permutation_generator; ///< Random permutation generator for sequence [0, quasi-factor) - static const size_t m_nHazardPtrCount = 2 ; ///< Count of hazard pointer required for the algorithm + static const size_t c_nHazardPtrCount = 2 ; ///< Count of hazard pointer required for the algorithm protected: //@cond -- 2.34.1