diff options
Diffstat (limited to 'source/blender/blenlib/BLI_set.hh')
| -rw-r--r-- | source/blender/blenlib/BLI_set.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_set.hh b/source/blender/blenlib/BLI_set.hh index 391d31c2228..62de4b79e41 100644 --- a/source/blender/blenlib/BLI_set.hh +++ b/source/blender/blenlib/BLI_set.hh @@ -136,10 +136,10 @@ class Set { uint64_t slot_mask_; /** This is called to hash incoming keys. */ - Hash hash_; + BLI_NO_UNIQUE_ADDRESS Hash hash_; /** This is called to check equality of two keys. */ - IsEqual is_equal_; + BLI_NO_UNIQUE_ADDRESS IsEqual is_equal_; /** The max load factor is 1/2 = 50% by default. */ #define LOAD_FACTOR 1, 2 @@ -483,10 +483,10 @@ class Set { * while iterating over the set. However, after this method has been called, the removed element * must not be accessed anymore. */ - void remove(const Iterator &iterator) + void remove(const Iterator &it) { /* The const cast is valid because this method itself is not const. */ - Slot &slot = const_cast<Slot &>(iterator.current_slot()); + Slot &slot = const_cast<Slot &>(it.current_slot()); BLI_assert(slot.is_occupied()); slot.remove(); removed_slots_++; |