diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-06-11 12:21:37 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-06-11 12:21:51 +0300 |
| commit | 95aa8ffed56e7bd1784bab64e82c82c4e855ae48 (patch) | |
| tree | 3f2ddf8e1653831304f8efb8488cf4a3d2095dff /source/blender | |
| parent | 665acd29039b278b6de87121b458675ab025ee33 (diff) | |
BLI: fix printing name in print_stats methods of Map, Set and VectorSet
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/BLI_hash_tables.hh | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_map.hh | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_set.hh | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_vector_set.hh | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_hash_tables.hh b/source/blender/blenlib/BLI_hash_tables.hh index b565b396a7a..c3b0b1f90e0 100644 --- a/source/blender/blenlib/BLI_hash_tables.hh +++ b/source/blender/blenlib/BLI_hash_tables.hh @@ -30,6 +30,7 @@ #include "BLI_math_base.h" #include "BLI_memory_utils.hh" #include "BLI_string.h" +#include "BLI_string_ref.hh" #include "BLI_utildefines.h" #include "BLI_vector.hh" diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh index 48cbcb4e3e9..4fc9f98d835 100644 --- a/source/blender/blenlib/BLI_map.hh +++ b/source/blender/blenlib/BLI_map.hh @@ -843,7 +843,7 @@ class Map { void print_stats(StringRef name = "") const { HashTableStats stats(*this, this->keys()); - stats.print(); + stats.print(name); } /** @@ -894,7 +894,7 @@ class Map { */ uint32_t size_in_bytes() const { - return sizeof(Slot) * m_slots.size(); + return (uint32_t)(sizeof(Slot) * m_slots.size()); } /** diff --git a/source/blender/blenlib/BLI_set.hh b/source/blender/blenlib/BLI_set.hh index ece9fb05d8c..af0c3424f5a 100644 --- a/source/blender/blenlib/BLI_set.hh +++ b/source/blender/blenlib/BLI_set.hh @@ -410,7 +410,7 @@ class Set { void print_stats(StringRef name = "") const { HashTableStats stats(*this, *this); - stats.print(); + stats.print(name); } /** 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); } /** |