Parcourir la source

Merge pull request #69946 from godotengine/revert-59234-3.x-rid-comparison-id

Revert "RID: Change comparison operators to use RID_Data id instead of address"
Rémi Verschelde il y a 2 ans
Parent
commit
9ef525c3a0
1 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 3 3
      core/rid.h

+ 3 - 3
core/rid.h

@@ -68,13 +68,13 @@ public:
 		return _data == p_rid._data;
 		return _data == p_rid._data;
 	}
 	}
 	_FORCE_INLINE_ bool operator<(const RID &p_rid) const {
 	_FORCE_INLINE_ bool operator<(const RID &p_rid) const {
-		return get_id() < p_rid.get_id();
+		return _data < p_rid._data;
 	}
 	}
 	_FORCE_INLINE_ bool operator<=(const RID &p_rid) const {
 	_FORCE_INLINE_ bool operator<=(const RID &p_rid) const {
-		return get_id() <= p_rid.get_id();
+		return _data <= p_rid._data;
 	}
 	}
 	_FORCE_INLINE_ bool operator>(const RID &p_rid) const {
 	_FORCE_INLINE_ bool operator>(const RID &p_rid) const {
-		return get_id() > p_rid.get_id();
+		return _data > p_rid._data;
 	}
 	}
 	_FORCE_INLINE_ bool operator!=(const RID &p_rid) const {
 	_FORCE_INLINE_ bool operator!=(const RID &p_rid) const {
 		return _data != p_rid._data;
 		return _data != p_rid._data;