diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-01 14:32:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 14:32:04 +0200 |
| commit | b0ce9401ffa731cc346ab6762fd0794709634428 (patch) | |
| tree | c2e6de01b9efec28c959dbfd5cd59a0973d432e7 /core/os/memory.h | |
| parent | 531c92a53e5e7b9a1cb55249ef6086e874239872 (diff) | |
| parent | 3c154eb93b3a098354bf6d18a9428826ec193f90 (diff) | |
Merge pull request #30126 from qarmin/remove_unnecessary_code
Remove unnecessary code and add some error explanations
Diffstat (limited to 'core/os/memory.h')
| -rw-r--r-- | core/os/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/memory.h b/core/os/memory.h index f3ca9fc614..e073b11e76 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -66,7 +66,7 @@ public: class DefaultAllocator { public: _FORCE_INLINE_ static void *alloc(size_t p_memory) { return Memory::alloc_static(p_memory, false); } - _FORCE_INLINE_ static void free(void *p_ptr) { return Memory::free_static(p_ptr, false); } + _FORCE_INLINE_ static void free(void *p_ptr) { Memory::free_static(p_ptr, false); } }; void *operator new(size_t p_size, const char *p_description); ///< operator new that takes a description and uses MemoryStaticPool |