isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-24 07:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use delete[] for array types in MxPtrList::Destroy

Browse Source
This commit is contained in:
Christian Semmler 2025-05-18 10:41:50 -07:00
parent b90215603b
commit c695834d66
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -8,7 +8,7 @@ include(CheckCXXSourceCompiles)
include(CMakeDependentOption) include(CMakeDependentOption)
include(CMakePushCheckState) include(CMakePushCheckState)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

12
LEGO1/omni/include/mxlist.h
View File

@ -5,6 +5,8 @@
#include "mxcore.h" #include "mxcore.h"
#include "mxtypes.h" #include "mxtypes.h"
#include <type_traits>
template <class T> template <class T>
class MxList; class MxList;
template <class T> template <class T>
@ -71,7 +73,15 @@ class MxPtrList : public MxList<T*> {
public: public:
MxPtrList(MxBool p_ownership) { SetOwnership(p_ownership); } MxPtrList(MxBool p_ownership) { SetOwnership(p_ownership); }
static void Destroy(T* p_obj) { delete p_obj; } static void Destroy(T* p_obj)
{
if constexpr (std::is_pointer<T>::value) {
delete[] p_obj;
}
else {
delete p_obj;
}
}
void SetOwnership(MxBool p_ownership) void SetOwnership(MxBool p_ownership)
{ {