diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-01 09:42:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 09:42:05 +0200 |
| commit | 59322d4cc43b76ead13501f950d6d1725313e72a (patch) | |
| tree | c0d3fe6b291d99b7b8ea70716fdb86043e4ec370 | |
| parent | bd26fa7bf2bf02f9ef17ad4ef3a93ffed3ffcf56 (diff) | |
| parent | 6bda2876f1466d76a64e0c3cfd31a783aabef0ca (diff) | |
Merge pull request #9011 from karroffel/ptrcall-nightmare-fix
fixed PowerState enum cast
| -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 |