From e71596a172a2668d9c74df8f90e3e61e83cc8b65 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sat, 20 Jul 2024 12:58:12 +0100 Subject: [PATCH] Removed asserts from etl::unique_ptr --- include/etl/memory.h | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/include/etl/memory.h b/include/etl/memory.h index 692b102ec..b285068bf 100644 --- a/include/etl/memory.h +++ b/include/etl/memory.h @@ -1395,14 +1395,15 @@ namespace etl //********************************* void reset(pointer p_ = pointer()) ETL_NOEXCEPT { - assert(p_ == ETL_NULLPTR || p_ != p); - - pointer value = p; - p = p_; - - if (value != ETL_NULLPTR) + if (p_ == ETL_NULLPTR || p_ != p) { - deleter(value); + pointer value = p; + p = p_; + + if (value != ETL_NULLPTR) + { + deleter(value); + } } } @@ -1592,20 +1593,21 @@ namespace etl { pointer value = p; p = ETL_NULLPTR; - return value; + return value; } //********************************* void reset(pointer p_) ETL_NOEXCEPT { - assert(p_ != p); - - pointer value = p; - p = p_; - - if (value != ETL_NULLPTR) + if (p_ != p) { - deleter(value); + pointer value = p; + p = p_; + + if (value != ETL_NULLPTR) + { + deleter(value); + } } }