[Bf-blender-cvs] [c14770370f0] master: Cleanup: fix implicit conversion warning

[Jacques Lucke]

Commit: c14770370f0f5906c479bb444f70a26733efade9
Author: Jacques Lucke
Date:   Sun Mar 7 14:27:08 2021 +0100
Branches: master
https://developer.blender.org/rBc14770370f0f5906c479bb444f70a26733efade9

Cleanup: fix implicit conversion warning

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

M	source/blender/blenlib/BLI_linear_allocator.hh

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

diff --git a/source/blender/blenlib/BLI_linear_allocator.hh b/source/blender/blenlib/BLI_linear_allocator.hh
index 0bf4ad194e1..47705b1d40b 100644
--- a/source/blender/blenlib/BLI_linear_allocator.hh
+++ b/source/blender/blenlib/BLI_linear_allocator.hh
@@ -215,8 +215,9 @@ template<typename Allocator = GuardedAllocator> class LinearAllocator : NonCopya
     int64_t size_in_bytes = min_allocation_size;
     if (size_in_bytes <= large_buffer_threshold) {
       /* Gradually grow buffer size with each allocation, up to a maximum. */
-      const int64_t grow_size = 1 << std::min<int64_t>(owned_buffers_.size() + 6, 20);
-      size_in_bytes = std::min(large_buffer_threshold, std::max(size_in_bytes, grow_size));
+      const int grow_size = 1 << std::min<int>(owned_buffers_.size() + 6, 20);
+      size_in_bytes = std::min(large_buffer_threshold,
+                               std::max<int64_t>(size_in_bytes, grow_size));
     }
 
     void *buffer = allocator_.allocate(size_in_bytes, min_alignment, __func__);