[Bf-blender-cvs] [8b0706a6c1d] functions: fix compile error

Jacques Lucke noreply at git.blender.org
Tue Aug 13 13:27:47 CEST 2019


Commit: 8b0706a6c1db98f42b8230d3231b16fbfe517fc0
Author: Jacques Lucke
Date:   Tue Aug 13 13:27:43 2019 +0200
Branches: functions
https://developer.blender.org/rB8b0706a6c1db98f42b8230d3231b16fbfe517fc0

fix compile error

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

M	source/blender/blenlib/BLI_monotonic_allocator.hpp

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

diff --git a/source/blender/blenlib/BLI_monotonic_allocator.hpp b/source/blender/blenlib/BLI_monotonic_allocator.hpp
index 90637fdbe18..e67573dab03 100644
--- a/source/blender/blenlib/BLI_monotonic_allocator.hpp
+++ b/source/blender/blenlib/BLI_monotonic_allocator.hpp
@@ -68,7 +68,7 @@ class MonotonicAllocator {
   void *allocate_aligned(uint size, uint alignment)
   {
     BLI_assert(is_power_of_2_i(alignment));
-    uint64_t space = size + alignment - 1;
+    size_t space = size + alignment - 1;
     void *ptr = this->allocate(space);
     void *aligned_ptr = std::align(alignment, size, ptr, space);
     BLI_assert(aligned_ptr != nullptr);



More information about the Bf-blender-cvs mailing list