diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-09 19:54:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 19:54:34 +0100 |
| commit | b4a066188579458412159e35c697070cb5e77070 (patch) | |
| tree | 4acee5465ec3c4aa58a0f88c926fdbfae460b9f0 /core | |
| parent | aa6a1094a5d4c06303d413c203c99158b8b4c7e2 (diff) | |
| parent | 11bf2ec6d161b737c7bce3172be48cd8ca4792cf (diff) | |
Merge pull request #43419 from reduz/document-operators
Make sure operators appear in the docs too
Diffstat (limited to 'core')
| -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)", + "-", + "+", "%", "<<", ">>", |