archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: fix implicit conversion warning

Browse Source
This commit is contained in:
Jacques Lucke
2021-03-07 14:27:08 +01:00
parent 649916f098
commit c14770370f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenlib/BLI_linear_allocator.hh
View File

@@ -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__);