Index: src/ch/ch.vc120.vcxproj =================================================================== diff -u -N -r17340fe8ee14f2c1a134a1381f0df151c6e41e7a -refef4b7b215e689180d0c02a3f7a89f8089bdc8e --- src/ch/ch.vc120.vcxproj (.../ch.vc120.vcxproj) (revision 17340fe8ee14f2c1a134a1381f0df151c6e41e7a) +++ src/ch/ch.vc120.vcxproj (.../ch.vc120.vcxproj) (revision efef4b7b215e689180d0c02a3f7a89f8089bdc8e) @@ -511,6 +511,7 @@ + @@ -749,6 +750,7 @@ NotUsing + Index: src/ch/ch.vc120.vcxproj.filters =================================================================== diff -u -N -r17340fe8ee14f2c1a134a1381f0df151c6e41e7a -refef4b7b215e689180d0c02a3f7a89f8089bdc8e --- src/ch/ch.vc120.vcxproj.filters (.../ch.vc120.vcxproj.filters) (revision 17340fe8ee14f2c1a134a1381f0df151c6e41e7a) +++ src/ch/ch.vc120.vcxproj.filters (.../ch.vc120.vcxproj.filters) (revision efef4b7b215e689180d0c02a3f7a89f8089bdc8e) @@ -203,6 +203,9 @@ Source Files\GUI\Dialogs + + Source Files\Tools + @@ -337,6 +340,9 @@ Source Files\GUI\Dialogs + + Source Files\Tools + Index: src/libchcore/TSubTaskArray.h =================================================================== diff -u -N -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -refef4b7b215e689180d0c02a3f7a89f8089bdc8e --- src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834) +++ src/libchcore/TSubTaskArray.h (.../TSubTaskArray.h) (revision efef4b7b215e689180d0c02a3f7a89f8089bdc8e) @@ -28,7 +28,12 @@ #include "TSubTaskBase.h" #include "TTaskLocalStats.h" #include "TSubTaskArrayStatsSnapshot.h" -#include + +#pragma warning(push) +#pragma warning(disable: 4100) + #include +#pragma warning(pop) + #include "TSharedModificationTracker.h" #include @@ -92,6 +97,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 + #pragma warning(pop) mutable object_id_t m_oidLastStoredIndex; Index: src/libchcore/libchcore.vc120.vcxproj =================================================================== diff -u -N -ra8e0d483b95f16847ea281f04046ada923154f74 -refef4b7b215e689180d0c02a3f7a89f8089bdc8e --- src/libchcore/libchcore.vc120.vcxproj (.../libchcore.vc120.vcxproj) (revision a8e0d483b95f16847ea281f04046ada923154f74) +++ src/libchcore/libchcore.vc120.vcxproj (.../libchcore.vc120.vcxproj) (revision efef4b7b215e689180d0c02a3f7a89f8089bdc8e) @@ -526,6 +526,7 @@ + @@ -679,6 +680,7 @@ + Index: src/libchcore/libchcore.vc120.vcxproj.filters =================================================================== diff -u -N -ra8e0d483b95f16847ea281f04046ada923154f74 -refef4b7b215e689180d0c02a3f7a89f8089bdc8e --- src/libchcore/libchcore.vc120.vcxproj.filters (.../libchcore.vc120.vcxproj.filters) (revision a8e0d483b95f16847ea281f04046ada923154f74) +++ src/libchcore/libchcore.vc120.vcxproj.filters (.../libchcore.vc120.vcxproj.filters) (revision efef4b7b215e689180d0c02a3f7a89f8089bdc8e) @@ -314,6 +314,9 @@ Source Files\Tools + + Source Files\Tools + @@ -583,5 +586,8 @@ Tests + + Source Files\Tools + \ No newline at end of file