Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory: minor changes

Browse Source
This commit is contained in:
Michele Caini
2022-02-28 23:44:09 +01:00
parent 0c1371ffae
commit e7c03dd512
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/entt/core/memory.hpp
View File

@@ -146,21 +146,21 @@ template<typename Type, typename Allocator, typename... Args>
auto allocate_unique(Allocator &allocator, Args &&...args) {
static_assert(!std::is_array_v<Type>, "Array types are not supported");
using alloc = typename std::allocator_traits<Allocator>::template rebind_alloc<Type>;
using alloc_traits = typename std::allocator_traits<alloc>;
using alloc_traits = typename std::allocator_traits<Allocator>::template rebind_traits<Type>;
using allocator_type = typename alloc_traits::allocator_type;
alloc type_allocator{allocator};
auto ptr = alloc_traits::allocate(type_allocator, 1u);
allocator_type alloc{allocator};
auto ptr = alloc_traits::allocate(alloc, 1u);
ENTT_TRY {
alloc_traits::construct(type_allocator, to_address(ptr), std::forward<Args>(args)...);
alloc_traits::construct(alloc, to_address(ptr), std::forward<Args>(args)...);
}
ENTT_CATCH {
alloc_traits::deallocate(type_allocator, ptr, 1u);
alloc_traits::deallocate(alloc, ptr, 1u);
ENTT_THROW;
}
return std::unique_ptr<Type, allocation_deleter<alloc>>{ptr, type_allocator};
return std::unique_ptr<Type, allocation_deleter<allocator_type>>{ptr, alloc};
}
/**