Merge branch 'dev' of github.com:khizmax/libcds into dev

diff --git a/src/dhp.cpp b/src/dhp.cpp
index 0991de10da0b060166c1907462dc39da7f565064..341cc3610a999e4cf640ce4796bc83ffae4a4a8e 100644 (file)
--- a/src/dhp.cpp
+++ b/src/dhp.cpp
@@ -210,8 +210,7 @@ namespace cds { namespace gc { namespace dhp {
         for ( thread_record* hprec = pHead; hprec; hprec = pNext )
         {
             assert( hprec->m_idOwner.load( atomics::memory_order_relaxed ) == nullThreadId
-                || hprec->m_idOwner.load( atomics::memory_order_relaxed ) == mainThreadId )
-            );
+                || hprec->m_idOwner.load( atomics::memory_order_relaxed ) == mainThreadId );
 
             retired_array& retired = hprec->retired_;
 

diff --git a/src/hp.cpp b/src/hp.cpp
index 99a3d1659fc2298574c891d182832519d44f5dcb..d3b16b5854ffd34de7707772e484d72241dfff36 100644 (file)
--- a/src/hp.cpp
+++ b/src/hp.cpp
@@ -162,8 +162,7 @@ namespace cds { namespace gc { namespace hp {
         for ( thread_record* hprec = pHead; hprec; hprec = pNext )
         {
             assert( hprec->m_idOwner.load( atomics::memory_order_relaxed ) == nullThreadId
-                || hprec->m_idOwner.load( atomics::memory_order_relaxed ) == mainThreadId )
-            );
+                || hprec->m_idOwner.load( atomics::memory_order_relaxed ) == mainThreadId );
 
             retired_array& arr = hprec->retired_;
             for ( retired_ptr* cur{ arr.first() }, *last{ arr.last() }; cur != last; ++cur ) {