diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-11 13:27:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 13:27:51 +0100 |
| commit | 6b1628f9fcc50dc16af08c2b87f27108ff6e15c5 (patch) | |
| tree | 5bb1ef20e714dc1d9a8421ee2419036534d2f230 /core/os/memory.cpp | |
| parent | 5c038acdc159708113fdc911c44abf1d6dcdbdf7 (diff) | |
| parent | 83069a3c0f01507acd24672c90b24c9eba868aba (diff) | |
| download | redot-engine-6b1628f9fcc50dc16af08c2b87f27108ff6e15c5.tar.gz | |
Merge pull request #33517 from madmiraal/fix-_MSG-macros
Send *_MSG macros' explanations directly to the _err_print_error().
Diffstat (limited to 'core/os/memory.cpp')
| -rw-r--r-- | core/os/memory.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/os/memory.cpp b/core/os/memory.cpp index d1de51f3db..f4ed1d6e27 100644 --- a/core/os/memory.cpp +++ b/core/os/memory.cpp @@ -50,20 +50,17 @@ void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)) { #ifdef _MSC_VER void operator delete(void *p_mem, const char *p_description) { - ERR_EXPLAINC("Call to placement delete should not happen."); - CRASH_NOW(); + CRASH_NOW_MSG("Call to placement delete should not happen."); } void operator delete(void *p_mem, void *(*p_allocfunc)(size_t p_size)) { - ERR_EXPLAINC("Call to placement delete should not happen."); - CRASH_NOW(); + CRASH_NOW_MSG("Call to placement delete should not happen."); } void operator delete(void *p_mem, void *p_pointer, size_t check, const char *p_description) { - ERR_EXPLAINC("Call to placement delete should not happen."); - CRASH_NOW(); + CRASH_NOW_MSG("Call to placement delete should not happen."); } #endif |