Renamed m_nHazardPtrCount to c_nHazardPtrCount

diff --git a/cds/container/segmented_queue.h b/cds/container/segmented_queue.h
index 6c60622134db2147aa373ee2afddebc10f8c27d7..ce75b2efa868fc0f8b0036c6071c7876ec55c651 100644 (file)
--- 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 6fc8b81bb9015a0781a2e7de800d98410efbf14e..f30fb8a8af02ea9c28cd24a3b904281c71d16242 100644 (file)
--- 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 9bd71f5d1bd06578059473bc00dd54a3c4d3a68b..2890e12667231568eb9e6b3462fbc97a5be7f400 100644 (file)
--- 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 a3ce3fa215e01b0e76d58d423ab7efb9e3da08fa..aba66db3abe21f52669c407e832ee58ae960a647 100644 (file)
--- 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<node>    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 a84948a90312b1206441025476b5eccc9deccec5..e707cc17b2d8ab8ccd7db005dadf242ac63d2a63 100644 (file)
--- 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