Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Variant: Rename Type::_RID to Type::RID

Browse source 
The underscore prefix was used to avoid the conflict between the `RID` class
name and the matching enum value in `Variant::Type`.

This can be fixed differently by prefixing uses of the `RID` class in `Variant`
with the scope resolution operator, as done already for `AABB`.
This commit is contained in:
Rémi Verschelde 2020-11-09 14:53:05 +01:00
parent bd0c40d051
commit 9d2e8f2f27
No known key found for this signature in database
GPG key ID: C3336907360768E1
31 changed files with 98 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/variant/variant_construct.cpp
View file

@ -577,7 +577,7 @@ void Variant::_register_variant_constructors() {
add_constructor<VariantConstructor<NodePath, NodePath>>(sarray("from"));
add_constructor<VariantConstructor<NodePath, String>>(sarray("from"));
add_constructor<VariantConstructor<RID, RID>>(sarray("from"));
add_constructor<VariantConstructor<::RID, ::RID>>(sarray("from"));
add_constructor<VariantConstructorObject>(sarray("from"));
add_constructor<VariantConstructorNilObject>(sarray("from"));
@ -654,7 +654,7 @@ void Variant::_register_variant_constructors() {
initialize_funcs[COLOR] = variant_initialize<Color>;
initialize_funcs[STRING_NAME] = variant_initialize<StringName>;
initialize_funcs[NODE_PATH] = variant_initialize<NodePath>;
initialize_funcs[_RID] = variant_initialize<RID>;
initialize_funcs[RID] = variant_initialize<::RID>;
initialize_funcs[OBJECT] = variant_initialize_obj;
initialize_funcs[CALLABLE] = variant_initialize<Callable>;
initialize_funcs[SIGNAL] = variant_initialize<Signal>;