AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[*] fix

Browse Source
This commit is contained in:
Reece Wilson 2024-04-21 06:53:34 +01:00
parent b47cf9f181
commit 76b5466e87
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Include/Aurora/Memory/CppHeapWrapper.hpp
View File

@ -152,19 +152,13 @@ namespace Aurora::Memory
template <class U, class... Args > template <class U, class... Args >
void construct(U *p, Args&&... args) void construct(U *p, Args&&... args)
{ {
if constexpr (AuIsClass_v<U>) new ((void *)p) U(AuForward<Args>(args)...);
{
new ((void *)p) U(AuForward<Args &&>(args)...);
}
} }
template <class U, class... Args > template <class U, class... Args >
void construct_at(U *p, Args&&... args) void construct_at(U *p, Args&&... args)
{ {
if constexpr (AuIsClass_v<U>) new ((void *)p) U(AuForward<Args>(args)...);
{
new ((void *)p) U(AuForward<Args &&>(args)...);
}
} }
void deallocate(const T *pType, void deallocate(const T *pType,
@ -199,18 +193,14 @@ namespace Aurora::Memory
U *new_object(CtorArgs&&... args) U *new_object(CtorArgs&&... args)
{ {
U *p = this->allocate_object<U>(); U *p = this->allocate_object<U>();
if constexpr (AuIsClass_v<U> && try
!AuIsTriviallyConstructible_v<U, CtorArgs>)
{ {
try this->construct(p, AuForward<CtorArgs>(args)...);
{ }
this->construct(p, AuForward<CtorArgs>(args)...); catch (...)
} {
catch (...) this->deallocate_object(p);
{ throw;
this->deallocate_object(p);
throw;
}
} }
return p; return p;
} }