[Bf-blender-cvs] [95aa8ffed56] master: BLI: fix printing name in print_stats methods of Map, Set and VectorSet
Jacques Lucke
noreply at git.blender.org
Thu Jun 11 11:22:17 CEST 2020
Commit: 95aa8ffed56e7bd1784bab64e82c82c4e855ae48
Author: Jacques Lucke
Date: Thu Jun 11 11:21:37 2020 +0200
Branches: master
https://developer.blender.org/rB95aa8ffed56e7bd1784bab64e82c82c4e855ae48
BLI: fix printing name in print_stats methods of Map, Set and VectorSet
===================================================================
M source/blender/blenlib/BLI_hash_tables.hh
M source/blender/blenlib/BLI_map.hh
M source/blender/blenlib/BLI_set.hh
M source/blender/blenlib/BLI_vector_set.hh
===================================================================
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);
}
/**
More information about the Bf-blender-cvs
mailing list