coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-16 00:46:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added nullptr check to unique_ptr destructor.

Browse Source
This commit is contained in:
John Wellbelove 2021-01-23 18:59:19 +00:00
parent 0f9e832708
commit c015545bcb
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/etl/memory.h
View File

@ -1426,6 +1426,25 @@ namespace etl
//*********************************
unique_ptr(unique_ptr&& p_) ETL_NOEXCEPT
: p(p_.release())
, deleter(etl::move(deleter_))
{
}
#endif
//*********************************
unique_ptr(pointer p_, typename etl::conditional<etl::is_reference<TDeleter>::value,
TDeleter,
typename etl::add_lvalue_reference<const TDeleter>::type>::type deleter_) ETL_NOEXCEPT
: p(p_)
, deleter(deleter_)
{
}
#if ETL_CPP11_SUPPORTED
//*********************************
unique_ptr(pointer p_, typename etl::remove_reference<TDeleter>::type&& deleter_) ETL_NOEXCEPT
: p(p_)
, deleter(etl::move(deleter_))
{
}
#endif
@ -1433,7 +1452,10 @@ namespace etl
//*********************************
~unique_ptr()
{
deleter(p);
if (p != ETL_NULLPTR)
{
deleter(p);
}
}
//*********************************