summaryrefslogtreecommitdiffstats
path: root/core/variant.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-08-05 19:48:29 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-08-05 19:50:53 -0300
commita3a7fb83e645112eb2b7f6620cda9fbaf434311a (patch)
tree89d5fb27992a04044751cda28d3f30ae45bc63a3 /core/variant.h
parent435bedd9ef58817926bb0e7df9586e1d137b761b (diff)
downloadredot-engine-a3a7fb83e645112eb2b7f6620cda9fbaf434311a.tar.gz
Made bool constructor explicit in Variant to avoid bugs, fixes #7843
Diffstat (limited to 'core/variant.h')
-rw-r--r--core/variant.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant.h b/core/variant.h
index 583a0d09a0..4d137efac2 100644
--- a/core/variant.h
+++ b/core/variant.h
@@ -42,8 +42,8 @@
#include "io/ip_address.h"
#include "math_2d.h"
#include "matrix3.h"
-#include "os/power.h"
#include "node_path.h"
+#include "os/power.h"
#include "plane.h"
#include "quat.h"
#include "rect3.h"
@@ -239,7 +239,7 @@ public:
operator IP_Address() const;
- Variant(bool p_bool);
+ explicit Variant(bool p_bool);
Variant(signed int p_int); // real one
Variant(unsigned int p_int);
#ifdef NEED_LONG_INT