diff --git a/CMakeLists.txt b/CMakeLists.txt index 89114566a..67a71d468 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ include_directories(BEFORE if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) - add_definitions(/wd4251 /wd4275 /wd4251 /wd4661) # Disable non-DLL-exported base class and other warnings + add_definitions(/wd4251 /wd4275 /wd4251 /wd4661 /wd4344) # Disable non-DLL-exported base class and other warnings endif() if(GTSAM_ENABLE_CONSISTENCY_CHECKS) diff --git a/examples/TimeTBB.cpp b/examples/TimeTBB.cpp index a513916b7..077331848 100644 --- a/examples/TimeTBB.cpp +++ b/examples/TimeTBB.cpp @@ -81,7 +81,7 @@ map testWithoutMemoryAllocation() tbb::parallel_for(tbb::blocked_range(0, numberOfProblems), WorkerWithoutAllocation(results)); tbb::tick_count t1 = tbb::tick_count::now(); cout << "Without memory allocation, grain size = " << grainSize << ", time = " << (t1 - t0).seconds() << endl; - timingResults[grainSize] = (t1 - t0).seconds(); + timingResults[(int)grainSize] = (t1 - t0).seconds(); } return timingResults; diff --git a/gtsam/base/treeTraversal/parallelTraversalTasks.h b/gtsam/base/treeTraversal/parallelTraversalTasks.h index 7e294643a..7986f9534 100644 --- a/gtsam/base/treeTraversal/parallelTraversalTasks.h +++ b/gtsam/base/treeTraversal/parallelTraversalTasks.h @@ -120,7 +120,7 @@ namespace gtsam { // If we have child tasks, start subtasks and wait for them to complete //postOrderTask.set_ref_count((int) treeNode->children.size()); - set_ref_count(treeNode->children.size()); + set_ref_count((int)treeNode->children.size()); spawn(childTasks); return firstChild; }