godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #112033 from Ivorforce/memnew-placement-char 

Fix `memnew_placement` with `char *` arguments
This commit is contained in:
Thaddeus Crews 2025-10-25 13:33:42 -05:00 committed by GitHub
parent ab6c6eece8 65bf516006
commit 0fdb93cde6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/os/memory.h
View File

@ -95,6 +95,10 @@ public:
_FORCE_INLINE_ static void free(void *p_ptr) { Memory::free_static(p_ptr, false); }
};
// Works around an issue where memnew_placement (char *) would call the p_description version.
inline void *operator new(size_t p_size, char *p_dest) {
return operator new(p_size, (void *)p_dest);
}
void *operator new(size_t p_size, const char *p_description); ///< operator new that takes a description and uses MemoryStaticPool
void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)); ///< operator new that takes a description and uses MemoryStaticPool