diff options
author | Julian Eisel <julian@blender.org> | 2020-06-11 12:55:40 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-06-11 12:55:40 +0300 |
commit | 15e6f9012c84c4ebce41bf1928635a3abe046a55 (patch) | |
tree | dfc33ab9de451f2f510ff09eadf8b6eb6fdbf19f /source/blender/blenlib/BLI_vector_set.hh | |
parent | 0b6def7059b6a64b3cef3ba7d4fa46000aee1761 (diff) | |
parent | 95aa8ffed56e7bd1784bab64e82c82c4e855ae48 (diff) |
Merge branch 'master' into asset-uuid
Diffstat (limited to 'source/blender/blenlib/BLI_vector_set.hh')
-rw-r--r-- | source/blender/blenlib/BLI_vector_set.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_vector_set.hh b/source/blender/blenlib/BLI_vector_set.hh index d330d3c3247..dcd4927aed2 100644 --- a/source/blender/blenlib/BLI_vector_set.hh +++ b/source/blender/blenlib/BLI_vector_set.hh @@ -433,7 +433,7 @@ class VectorSet { void print_stats(StringRef name = "") const { HashTableStats stats(*this, this->as_span()); - stats.print(); + stats.print(name); } /** @@ -482,7 +482,7 @@ class VectorSet { */ uint32_t size_in_bytes() const { - return sizeof(Slot) * m_slots.size() + sizeof(Key) * m_usable_slots; + return (uint32_t)(sizeof(Slot) * m_slots.size() + sizeof(Key) * m_usable_slots); } /** |