summaryrefslogtreecommitdiff
path: root/core/variant.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-02-17 07:48:06 +0100
committerGitHub <noreply@github.com>2017-02-17 07:48:06 +0100
commit36986531afe3996de05640ff02088d18b24d409c (patch)
tree27bd4f630dda96d028aa0efd7752000844ac996b /core/variant.h
parent903a3aa5f0e128abb1fb752c10b343b34af8f799 (diff)
parentb696beea65bbffd31edac169ccf9708f46ab9652 (diff)
Merge pull request #7815 from hpvb/fix-7354
Correct hash behavior for floating point numbers
Diffstat (limited to 'core/variant.h')
-rw-r--r--core/variant.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/variant.h b/core/variant.h
index 5936325c1b..f9ceca1ca0 100644
--- a/core/variant.h
+++ b/core/variant.h
@@ -421,6 +421,7 @@ public:
bool operator<(const Variant& p_variant) const;
uint32_t hash() const;
+ bool hash_compare(const Variant& p_variant) const;
bool booleanize(bool &valid) const;
void static_assign(const Variant& p_variant);
@@ -459,6 +460,10 @@ struct VariantHasher {
static _FORCE_INLINE_ uint32_t hash(const Variant &p_variant) { return p_variant.hash(); }
};
+struct VariantComparator {
+
+ static _FORCE_INLINE_ bool compare(const Variant &p_lhs, const Variant &p_rhs) { return p_lhs.hash_compare(p_rhs); }
+};
Variant::ObjData& Variant::_get_obj() {