diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-22 09:15:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 09:15:45 +0200 |
| commit | be606898122d8e6cd259bfde8132dbce62d0b2ff (patch) | |
| tree | c9ea3d8a8d81d5c9595248f19b8fa9087930fbd6 /core/variant.cpp | |
| parent | 9906aeb2f8b492e6662e68aafe11e62524a87cc8 (diff) | |
| parent | 22358babda1452ee6db4d662dff373472b93fdc6 (diff) | |
Merge pull request #11461 from hpvb/add-likely-macros
Implement Linux-style likely()/unlikely() macros
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 52bdd4e22d..f70e4a5218 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -2469,10 +2469,10 @@ Variant::Variant(const Vector<Color> &p_array) { void Variant::operator=(const Variant &p_variant) { - if (this == &p_variant) + if (unlikely(this == &p_variant)) return; - if (type != p_variant.type) { + if (unlikely(type != p_variant.type)) { reference(p_variant); return; } |