Index: src/libchcore/TSubTaskArray.h =================================================================== diff -u -N -r7d59ab9183c933f2fc2682a95fb5d26cf2f952d7 -r7972b0944e0a947144fbdb93262f7d73ac528dc7 --- src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision 7d59ab9183c933f2fc2682a95fb5d26cf2f952d7) +++ src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision 7972b0944e0a947144fbdb93262f7d73ac528dc7) @@ -28,14 +28,9 @@ #include "TSubTaskBase.h" #include "TTaskLocalStats.h" #include "TSubTaskArrayStatsSnapshot.h" - -#pragma warning(push) -#pragma warning(disable: 4100) - #include -#pragma warning(pop) - #include "TSharedModificationTracker.h" #include +#include BEGIN_CHCORE_NAMESPACE @@ -96,7 +91,7 @@ std::vector > m_vSubTasks; // pointer to the subtask object / is this the part of estimation? - mutable boost::atomic m_oidSubOperationIndex; // index of sub-operation from TOperationDescription + mutable std::atomic m_oidSubOperationIndex; // index of sub-operation from TOperationDescription #pragma warning(pop)