diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-09 17:46:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 17:46:34 +0100 |
| commit | 827e5b8bf3ba84719fd98b9a50f6d744de3561e0 (patch) | |
| tree | 6089285a595c7f10317a0701206edfb9a7aff83b /core/io/marshalls.cpp | |
| parent | fdf84d25f3070f7cb8b6fb771f4a71ae4fb25f8e (diff) | |
| parent | 9d2e8f2f27ec467e9004e0d94f8106b3bb1d0afd (diff) | |
Merge pull request #43412 from akien-mga/variant-rename-_RID-to-RID
Variant: Rename Type::_RID to Type::RID
Diffstat (limited to 'core/io/marshalls.cpp')
| -rw-r--r-- | core/io/marshalls.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index c354c8ea63..3cf4acaf39 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -420,7 +420,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int } } break; - case Variant::_RID: { + case Variant::RID: { r_variant = RID(); } break; case Variant::OBJECT: { @@ -1172,7 +1172,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo r_len += 4 * 4; } break; - case Variant::_RID: { + case Variant::RID: { } break; case Variant::CALLABLE: { } break; |