diff options
| author | Matthias Hoelzl | 2017-11-18 08:46:53 +0100 |
|---|---|---|
| committer | Matthias Hoelzl | 2017-11-19 21:25:18 +0100 |
| commit | 4c76c6892c1770f4e8f95bd8a4d8dcddf31d96d4 (patch) | |
| tree | e9c0d3fabf688ce7a95241a9b45d8dfaa2ed2910 /core/os/memory.h | |
| parent | 63283eca5542314ea5b71afa1fe39bd48c202a4d (diff) | |
| download | godot-4c76c6892c1770f4e8f95bd8a4d8dcddf31d96d4.tar.gz godot-4c76c6892c1770f4e8f95bd8a4d8dcddf31d96d4.tar.zst godot-4c76c6892c1770f4e8f95bd8a4d8dcddf31d96d4.zip | |
Diffstat (limited to 'core/os/memory.h')
| -rw-r--r-- | core/os/memory.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/os/memory.h b/core/os/memory.h index f8b3da579..7801d5683 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -72,6 +72,14 @@ void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)); ///< ope void *operator new(size_t p_size, void *p_pointer, size_t check, const char *p_description); ///< operator new that takes a description and uses a pointer to the preallocated memory +#ifdef _MSC_VER +// When compiling with VC++ 2017, the above declarations of placement new generate many irrelevant warnings (C4291). +// The purpose of the following definitions is to muffle these warnings, not to provide a usable implementation of placement delete. +void operator delete(void *p_mem, const char *p_description); +void operator delete(void *p_mem, void *(*p_allocfunc)(size_t p_size)); +void operator delete(void *p_mem, void *p_pointer, size_t check, const char *p_description); +#endif + #define memalloc(m_size) Memory::alloc_static(m_size) #define memrealloc(m_mem, m_size) Memory::realloc_static(m_mem, m_size) #define memfree(m_size) Memory::free_static(m_size) |
