diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-28 11:04:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 11:04:05 +0200 |
| commit | 305b2a15bf1ed950e8e2ed50fa84456b584798fb (patch) | |
| tree | abaa1e01ca34382f4ea1d6e24c403ecff1502f39 /core/object/callable_method_pointer.h | |
| parent | 7bca90769cbf7ae29023ca8d83ba7ab3137deda3 (diff) | |
| parent | 8247667a3ee0d86f26094e722497b0cbb99cc12b (diff) | |
| download | redot-engine-305b2a15bf1ed950e8e2ed50fa84456b584798fb.tar.gz | |
Merge pull request #48239 from akien-mga/goodbye-copymem
Core: Drop custom `copymem`/`zeromem` defines
Diffstat (limited to 'core/object/callable_method_pointer.h')
| -rw-r--r-- | core/object/callable_method_pointer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/object/callable_method_pointer.h b/core/object/callable_method_pointer.h index 115797a00c..8ba01be4e4 100644 --- a/core/object/callable_method_pointer.h +++ b/core/object/callable_method_pointer.h @@ -32,7 +32,6 @@ #define CALLABLE_METHOD_POINTER_H #include "core/object/object.h" -#include "core/os/copymem.h" #include "core/templates/hashfuncs.h" #include "core/templates/simple_type.h" #include "core/variant/binder_common.h" @@ -98,7 +97,7 @@ public: } CallableCustomMethodPointer(T *p_instance, void (T::*p_method)(P...)) { - zeromem(&data, sizeof(Data)); // Clear beforehand, may have padding bytes. + memset(&data, 0, sizeof(Data)); // Clear beforehand, may have padding bytes. data.instance = p_instance; #ifdef DEBUG_ENABLED data.object_id = p_instance->get_instance_id(); @@ -153,7 +152,7 @@ public: } CallableCustomMethodPointerRet(T *p_instance, R (T::*p_method)(P...)) { - zeromem(&data, sizeof(Data)); // Clear beforehand, may have padding bytes. + memset(&data, 0, sizeof(Data)); // Clear beforehand, may have padding bytes. data.instance = p_instance; #ifdef DEBUG_ENABLED data.object_id = p_instance->get_instance_id(); @@ -208,7 +207,7 @@ public: } CallableCustomMethodPointerRetC(T *p_instance, R (T::*p_method)(P...) const) { - zeromem(&data, sizeof(Data)); // Clear beforehand, may have padding bytes. + memset(&data, 0, sizeof(Data)); // Clear beforehand, may have padding bytes. data.instance = p_instance; #ifdef DEBUG_ENABLED data.object_id = p_instance->get_instance_id(); |