diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-08-26 13:07:52 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 13:07:52 -0300 |
| commit | d19b12dbd23d04fee8f5b973b75edd383f68e6ef (patch) | |
| tree | bd3050032a13f4312fbaa75f506b079da6773bfd /core | |
| parent | f89adbf112f89356569705f3e574b8ced1f68738 (diff) | |
| parent | eba7265a1cc43c0c8c0c4f31fb0d91848717bfa9 (diff) | |
Merge pull request #52107 from timothyqiu/overriden
Fix misspelled "overriden"
Diffstat (limited to 'core')
| -rw-r--r-- | core/object/make_virtuals.py | 2 | ||||
| -rw-r--r-- | core/object/object.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/object/make_virtuals.py b/core/object/make_virtuals.py index 65a421cfb2..86c2891e5d 100644 --- a/core/object/make_virtuals.py +++ b/core/object/make_virtuals.py @@ -23,7 +23,7 @@ _FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\ \\ return false;\\ }\\ -_FORCE_INLINE_ bool _gdvirtual_##m_name##_overriden() const { \\ +_FORCE_INLINE_ bool _gdvirtual_##m_name##_overridden() const { \\ ScriptInstance *script_instance = ((Object*)(this))->get_script_instance();\\ if (script_instance) {\\ return script_instance->has_method(_gdvirtual_##m_name##_sn);\\ diff --git a/core/object/object.h b/core/object/object.h index a53143158b..102776a589 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -289,8 +289,8 @@ struct ObjectNativeExtension { #else #define GDVIRTUAL_BIND(m_name, ...) #endif -#define GDVIRTUAL_IS_OVERRIDEN(m_name) _gdvirtual_##m_name##_overriden() -#define GDVIRTUAL_IS_OVERRIDEN_PTR(m_obj, m_name) m_obj->_gdvirtual_##m_name##_overriden() +#define GDVIRTUAL_IS_OVERRIDDEN(m_name) _gdvirtual_##m_name##_overridden() +#define GDVIRTUAL_IS_OVERRIDDEN_PTR(m_obj, m_name) m_obj->_gdvirtual_##m_name##_overridden() /* the following is an incomprehensible blob of hacks and workarounds to compensate for many of the fallencies in C++. As a plus, this macro pretty much alone defines the object model. |