diff options
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/variant.h | 2 | ||||
| -rw-r--r-- | core/variant/variant_op.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/variant/variant.h b/core/variant/variant.h index 8bb28b2406..ee08373b27 100644 --- a/core/variant/variant.h +++ b/core/variant/variant.h @@ -467,7 +467,7 @@ public: return res; } - Variant::Type get_operator_return_type(Operator p_operator, Type p_type_a, Type p_type_b); + static Variant::Type get_operator_return_type(Operator p_operator, Type p_type_a, Type p_type_b); typedef void (*ValidatedOperatorEvaluator)(const Variant *left, const Variant *right, Variant *r_ret); static ValidatedOperatorEvaluator get_validated_operator_evaluator(Operator p_operator, Type p_type_a, Type p_type_b); #ifdef PTRCALL_ENABLED diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp index 4704deac20..8e55c1d6cd 100644 --- a/core/variant/variant_op.cpp +++ b/core/variant/variant_op.cpp @@ -2145,8 +2145,8 @@ static const char *_op_names[Variant::OP_MAX] = { "-", "*", "/", - "- (negation)", - "+ (positive)", + "-", + "+", "%", "<<", ">>", |