From 6bda2876f1466d76a64e0c3cfd31a783aabef0ca Mon Sep 17 00:00:00 2001 From: Karroffel Date: Thu, 1 Jun 2017 00:16:33 +0200 Subject: [PATCH] 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. --- core/method_ptrcall.h | 1 - core/os/os.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index bcbf2e4531bf..c6dbfc2a7ac1 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 037ce436c1ad..11fe8b44e36f 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -413,4 +413,6 @@ public: virtual ~OS(); }; +VARIANT_ENUM_CAST(PowerState); + #endif