diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-13 14:38:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 14:38:43 +0200 |
| commit | cbd519f1f4ffcf0aeeed2c6cf2b761defd9ffb87 (patch) | |
| tree | 90b326e1f6bf13cca2c82461ceefd51f8b5c4a41 /modules/gdscript/gdscript_parser.h | |
| parent | 1c18be1cc9ee95f80435c761ea8c1574503ac5c3 (diff) | |
| parent | e7f056dfac382facbaeda903bf8639c32e87bf18 (diff) | |
| download | redot-engine-cbd519f1f4ffcf0aeeed2c6cf2b761defd9ffb87.tar.gz | |
Merge pull request #38707 from ThakeeNathees/static-const-access-bug-fix
regression: static func can't access const fix
Diffstat (limited to 'modules/gdscript/gdscript_parser.h')
| -rw-r--r-- | modules/gdscript/gdscript_parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index a33417e536..834bab02a4 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -635,7 +635,7 @@ private: DataType _get_operation_type(const Variant::Operator p_op, const DataType &p_a, const DataType &p_b, bool &r_valid) const; Variant::Operator _get_variant_operation(const OperatorNode::Operator &p_op) const; bool _get_function_signature(DataType &p_base_type, const StringName &p_function, DataType &r_return_type, List<DataType> &r_arg_types, int &r_default_arg_count, bool &r_static, bool &r_vararg) const; - bool _get_member_type(const DataType &p_base_type, const StringName &p_member, DataType &r_member_type) const; + bool _get_member_type(const DataType &p_base_type, const StringName &p_member, DataType &r_member_type, bool *r_is_const = nullptr) const; bool _is_type_compatible(const DataType &p_container, const DataType &p_expression, bool p_allow_implicit_conversion = false) const; Node *_get_default_value_for_type(const DataType &p_type, int p_line = -1); |