[Bf-blender-cvs] [390175ad896] temp-tbb-task-scheduler: Tasks: Fix Compiler Errors

[Jeroen Bakker]

Commit: 390175ad8968ce2f482209f4c182e51bda7c08d7
Author: Jeroen Bakker
Date:   Thu Apr 9 11:08:08 2020 +0200
Branches: temp-tbb-task-scheduler
https://developer.blender.org/rB390175ad8968ce2f482209f4c182e51bda7c08d7

Tasks: Fix Compiler Errors

===================================================================

M	source/blender/blenlib/intern/task_pool.cc
M	source/blender/blenlib/intern/task_range.cc

===================================================================

diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc
index ea2183bbfca..1a5d1c50a45 100644
--- a/source/blender/blenlib/intern/task_pool.cc
+++ b/source/blender/blenlib/intern/task_pool.cc
@@ -500,6 +500,8 @@ bool BLI_task_pool_canceled(TaskPool *pool)
     case TASK_POOL_BACKGROUND_SERIAL:
       return background_task_pool_canceled(pool);
   }
+  /* Some compilers don't see that the switch statement handles all possible cases. */
+  return true;
 }
 
 void *BLI_task_pool_userdata(TaskPool *pool)
diff --git a/source/blender/blenlib/intern/task_range.cc b/source/blender/blenlib/intern/task_range.cc
index cabe3333e78..297b8f6dd86 100644
--- a/source/blender/blenlib/intern/task_range.cc
+++ b/source/blender/blenlib/intern/task_range.cc
@@ -114,7 +114,7 @@ void BLI_task_parallel_range(const int start,
   /* Multithreading. */
   if (settings->use_threading && BLI_task_scheduler_num_threads() > 1) {
     RangeTask task(func, userdata, settings);
-    const size_t grainsize = MAX(settings->min_iter_per_thread, 1);
+    const size_t grainsize = MAX2(settings->min_iter_per_thread, 1);
     const tbb::blocked_range<int> range(start, stop, grainsize);
 
     if (settings->func_reduce) {