diff options
| author | Karroffel <therzog@mail.de> | 2017-06-01 00:16:33 +0200 |
|---|---|---|
| committer | Karroffel <therzog@mail.de> | 2017-06-01 00:16:33 +0200 |
| commit | 6bda2876f1466d76a64e0c3cfd31a783aabef0ca (patch) | |
| tree | ddcbd0c341805548a7f3c88f5f7c42ba28338622 /core | |
| parent | a802bd91d000647a40e401c14c0d323209bc6446 (diff) | |
fixed PowerState enum cast
Quite a while ago I made a commit (131631b) where I did a weird
thing to fix compilation with PTRCALL_ENABLED. And I couldn't
sleep because of this after all these months. So here is the
proper version.
Diffstat (limited to 'core')
| -rw-r--r-- | core/method_ptrcall.h | 1 | ||||
| -rw-r--r-- | core/os/os.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index bcbf2e4531..c6dbfc2a7a 100644 --- a/core/method_ptrcall.h +++ b/core/method_ptrcall.h @@ -115,7 +115,6 @@ MAKE_PTRARG(PoolVector2Array); MAKE_PTRARG(PoolVector3Array); MAKE_PTRARG(PoolColorArray); MAKE_PTRARG(Variant); -MAKE_PTRARG(PowerState); //this is for Object diff --git a/core/os/os.h b/core/os/os.h index 037ce436c1..11fe8b44e3 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -413,4 +413,6 @@ public: virtual ~OS(); }; +VARIANT_ENUM_CAST(PowerState); + #endif |