Merge pull request #64789 from derammo/derammo_const_ref

Change Ref<T> to allow non const access to ptr
godotengine · May 17, 2023 · 56fc631 · 56fc631
2 parents 411b6a9 + 65116a7
commit 56fc631
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/core/object/ref_counted.h b/core/object/ref_counted.h
@@ -97,26 +97,15 @@ class Ref {
 		return reference != p_r.reference;
 	}
 
-	_FORCE_INLINE_ T *operator->() {
+	_FORCE_INLINE_ T *operator*() const {
 		return reference;
 	}
 
-	_FORCE_INLINE_ T *operator*() {
+	_FORCE_INLINE_ T *operator->() const {
 		return reference;
 	}
 
-	_FORCE_INLINE_ const T *operator->() const {
-		return reference;
-	}
-
-	_FORCE_INLINE_ const T *ptr() const {
-		return reference;
-	}
-	_FORCE_INLINE_ T *ptr() {
-		return reference;
-	}
-
-	_FORCE_INLINE_ const T *operator*() const {
+	_FORCE_INLINE_ T *ptr() const {
 		return reference;
 	}