Index: src/libchcore/TSubTaskArray.cpp =================================================================== diff -u -N -r0a0d5b6931648028bc0082cb83d0c0cf82cfa7d8 -r7972b0944e0a947144fbdb93262f7d73ac528dc7 --- src/libchcore/TSubTaskArray.cpp (.../TSubTaskArray.cpp) (revision 0a0d5b6931648028bc0082cb83d0c0cf82cfa7d8) +++ src/libchcore/TSubTaskArray.cpp (.../TSubTaskArray.cpp) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) @@ -67,7 +67,7 @@ { m_vSubTasks.clear(); m_rSubTaskContext.GetFilesCache().Clear(); - m_oidSubOperationIndex.store(0, boost::memory_order_release); + m_oidSubOperationIndex.store(0, std::memory_order_release); m_eOperationType = rOperationPlan.GetOperationType(); @@ -102,7 +102,7 @@ void TSubTasksArray::ResetProgressAndStats() { - m_oidSubOperationIndex.store(0, boost::memory_order_release); + m_oidSubOperationIndex.store(0, std::memory_order_release); for(const std::pair& tupleRow : m_vSubTasks) { @@ -118,7 +118,7 @@ TSubTaskBase::ESubOperationResult eResult = TSubTaskBase::eSubResult_Continue; object_id_t oidSize = boost::numeric_cast(m_vSubTasks.size()); - object_id_t oidIndex = m_oidSubOperationIndex.load(boost::memory_order_acquire); + object_id_t oidIndex = m_oidSubOperationIndex.load(std::memory_order_acquire); while(oidIndex < oidSize) { @@ -136,7 +136,7 @@ if(eResult != TSubTaskBase::eSubResult_Continue) break; - oidIndex = m_oidSubOperationIndex.fetch_add(1, boost::memory_order_release) + 1; + oidIndex = m_oidSubOperationIndex.fetch_add(1, std::memory_order_release) + 1; } return eResult; @@ -153,7 +153,7 @@ // current task // ugly const_cast - const method, non-const interlocked intrinsic and we're really not modifying the member... - object_id_t oidIndex = m_oidSubOperationIndex.load(boost::memory_order_acquire); + object_id_t oidIndex = m_oidSubOperationIndex.load(std::memory_order_acquire); rSnapshot.SetCurrentSubtaskIndex(oidIndex); // progress @@ -195,7 +195,7 @@ InitSubtasksColumns(spContainer); // base data - object_id_t oidCurrentIndex = m_oidSubOperationIndex.load(boost::memory_order_acquire); + object_id_t oidCurrentIndex = m_oidSubOperationIndex.load(std::memory_order_acquire); // subtasks are stored only once when added as they don't change (at least in context of their order and type) if(bAdded) @@ -282,7 +282,7 @@ if(bIsCurrent) { - m_oidSubOperationIndex.store(oidID, boost::memory_order_release); + m_oidSubOperationIndex.store(oidID, std::memory_order_release); m_oidLastStoredIndex = oidID; } @@ -298,7 +298,7 @@ if(m_oidLastStoredIndex == -1) { - m_oidSubOperationIndex.store(boost::numeric_cast(m_vSubTasks.size()), boost::memory_order_release); + m_oidSubOperationIndex.store(boost::numeric_cast(m_vSubTasks.size()), std::memory_order_release); m_oidLastStoredIndex = boost::numeric_cast(m_vSubTasks.size()); } }