diff options
| author | Jacques Lucke <mail@jlucke.com> | 2020-02-10 15:54:57 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2020-02-10 16:09:01 +0300 |
| commit | 68cc982dcb7c1063a96f7ec9b7ccb95da4919d6b (patch) | |
| tree | 9d2076363b54cb6b6da96064453ac3499a5f65c8 /source/blender/blenlib/BLI_open_addressing.h | |
| parent | 76208a5670bc9d70f99f22a3c49463959461b5c1 (diff) | |
BLI: improve various C++ data structures
The changes come from the `functions` branch, where I'm using
these structures a lot.
This also includes a new `BLI::Optional<T>` type, which is similar
to `std::Optional<T>` which can be used when Blender starts using
C++17.
Diffstat (limited to 'source/blender/blenlib/BLI_open_addressing.h')
| -rw-r--r-- | source/blender/blenlib/BLI_open_addressing.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_open_addressing.h b/source/blender/blenlib/BLI_open_addressing.h index 8ca5156a952..a238902c631 100644 --- a/source/blender/blenlib/BLI_open_addressing.h +++ b/source/blender/blenlib/BLI_open_addressing.h @@ -70,7 +70,7 @@ class OpenAddressingArray { /* Can be used to map a hash value into the range of valid slot indices. */ uint32_t m_slot_mask; Allocator m_allocator; - char m_local_storage[sizeof(Item) * ItemsInSmallStorage]; + AlignedBuffer<sizeof(Item) * ItemsInSmallStorage, alignof(Item)> m_local_storage; public: explicit OpenAddressingArray(uint8_t item_exponent = 0) @@ -291,7 +291,7 @@ class OpenAddressingArray { private: Item *small_storage() const { - return reinterpret_cast<Item *>((char *)m_local_storage); + return reinterpret_cast<Item *>((char *)m_local_storage.ptr()); } bool is_in_small_storage() const |