tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove construct/destruct from allocator

v1
Brett 2023-12-20 14:36:46 -05:00
parent 65320bf89d
commit 665f6e0186
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/blt/std/allocator.h
View File

@ -162,14 +162,16 @@ namespace blt
/** /**
* Calls the constructor on elements if they require construction, otherwise constructor will not be called and this function is useless * Calls the constructor on elements if they require construction, otherwise constructor will not be called and this function is useless
*
* ALLOCATORS RETURN UNINIT STORAGE!! THIS HAS BEEN DISABLED.
*/ */
inline void allocate_in_block(pointer begin, size_t n) inline void allocate_in_block(pointer begin, size_t n)
{ {
if constexpr (std::is_default_constructible_v<T> && !std::is_trivially_default_constructible_v<T>) // if constexpr (std::is_default_constructible_v<T> && !std::is_trivially_default_constructible_v<T>)
{ // {
for (size_t i = 0; i < n; i++) // for (size_t i = 0; i < n; i++)
new(&begin[i]) T(); // new(&begin[i]) T();
} // }
} }
public: public:
@ -180,14 +182,14 @@ namespace blt
area_allocator(const area_allocator& copy) = delete; area_allocator(const area_allocator& copy) = delete;
area_allocator(area_allocator&& move) area_allocator(area_allocator&& move) noexcept
{ {
blocks = move.blocks; blocks = move.blocks;
} }
area_allocator& operator=(const area_allocator& copy) = delete; area_allocator& operator=(const area_allocator& copy) = delete;
area_allocator& operator=(area_allocator&& move) area_allocator& operator=(area_allocator&& move) noexcept
{ {
std::swap(move.blocks, blocks); std::swap(move.blocks, blocks);
} }
@ -208,8 +210,8 @@ namespace blt
void deallocate(pointer p, size_t n) noexcept void deallocate(pointer p, size_t n) noexcept
{ {
for (size_t i = 0; i < n; i++) // for (size_t i = 0; i < n; i++)
p[i].~T(); // p[i].~T();
for (auto*& blk : blocks) for (auto*& blk : blocks)
{ {
if (p >= blk->data && p <= (blk->data + BLOCK_SIZE)) if (p >= blk->data && p <= (blk->data + BLOCK_SIZE))
@ -232,7 +234,7 @@ namespace blt
p->~U(); p->~U();
} }
inline size_t max_size() const [[nodiscard]] inline size_t max_size() const
{ {
return std::numeric_limits<size_t>::max(); return std::numeric_limits<size_t>::max();
} }

6
include/blt/std/binary_tree.h
View File

@ -58,6 +58,12 @@ namespace blt
ALLOC alloc; ALLOC alloc;
node* root = nullptr; node* root = nullptr;
node* newNode(const T& t)
{
return alloc.allocate(1);
}
public: public:
AVL_node_tree() = default; AVL_node_tree() = default;