summaryrefslogtreecommitdiff
path: root/core/variant
diff options
context:
space:
mode:
authorBrian Semrau <brian.semrau@gmail.com>2020-12-16 08:59:06 -0500
committerBrian Semrau <brian.semrau@gmail.com>2020-12-16 08:59:06 -0500
commitbb4d44102deaf8f282a25b409c290ea6d64aed57 (patch)
tree34e3cf37cca37c009717419b06df6f2bc58ef037 /core/variant
parentf17b34c4793590978d999d0e9b5cde8666136e10 (diff)
Fix bitwise-and eval not updating return type
Diffstat (limited to 'core/variant')
-rw-r--r--core/variant/variant_op.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp
index df29ec7b63..e988a2b703 100644
--- a/core/variant/variant_op.cpp
+++ b/core/variant/variant_op.cpp
@@ -318,6 +318,7 @@ public:
r_valid = true;
}
static void validated_evaluate(const Variant *left, const Variant *right, Variant *r_ret) {
+ VariantTypeChanger<R>::change(r_ret);
*VariantGetInternalPtr<R>::get_ptr(r_ret) = *VariantGetInternalPtr<A>::get_ptr(left) & *VariantGetInternalPtr<B>::get_ptr(right);
}
static void ptr_evaluate(const void *left, const void *right, void *r_ret) {