diff --git a/libs/libxx/libcxxmini/libxx_new.cxx b/libs/libxx/libcxxmini/libxx_new.cxx index 0488134c203..16aacd16bcd 100644 --- a/libs/libxx/libcxxmini/libxx_new.cxx +++ b/libs/libxx/libcxxmini/libxx_new.cxx @@ -22,6 +22,7 @@ //*************************************************************************** #include +#include #include #include @@ -68,6 +69,8 @@ FAR void *operator new(std::size_t nbytes) } #endif + DEBUGASSERT(alloc != nullptr); + // Return the allocated value return alloc; @@ -75,13 +78,7 @@ FAR void *operator new(std::size_t nbytes) FAR void *operator new(std::size_t nbytes, FAR void *ptr) { - -#ifdef CONFIG_DEBUG_ERROR - if (ptr == 0) - { - _err("ERROR: Failed to placement new\n"); - } -#endif + DEBUGASSERT(ptr != nullptr); // Return the ptr pointer diff --git a/libs/libxx/libcxxmini/libxx_newa.cxx b/libs/libxx/libcxxmini/libxx_newa.cxx index e5871e8f7f4..f2974534a53 100644 --- a/libs/libxx/libcxxmini/libxx_newa.cxx +++ b/libs/libxx/libcxxmini/libxx_newa.cxx @@ -22,6 +22,7 @@ //*************************************************************************** #include +#include #include #include @@ -76,6 +77,8 @@ FAR void *operator new[](std::size_t nbytes) } #endif + DEBUGASSERT(alloc != nullptr); + // Return the allocated value return alloc; @@ -83,13 +86,7 @@ FAR void *operator new[](std::size_t nbytes) FAR void *operator new[](std::size_t nbytes, FAR void *ptr) { - -#ifdef CONFIG_DEBUG_ERROR - if (ptr == 0) - { - _err("ERROR: Failed to placement new[]\n"); - } -#endif + DEBUGASSERT(ptr != nullptr); // Return the ptr pointer