Thread/Accessor: Deducing this

MorganCaron · MorganCaron · commit 7a96a3fddc2b · 2025-11-15T08:41:08.000+01:00
diff --git a/modules/Thread/UniqueLocker.mpp b/modules/Thread/UniqueLocker.mpp
@@ -13,14 +13,16 @@ export namespace CppUtils::Thread
 			m_value{std::ref(value)}
 		{}
 
-		[[nodiscard]] inline auto value() & noexcept -> T&
+		template<class Self>
+		[[nodiscard]] inline auto value(this Self& self) noexcept -> decltype(auto)
 		{
-			return m_value.get();
+			return self.m_value.get();
 		}
 
-		[[nodiscard]] inline auto operator->() & noexcept -> T*
+		template<class Self>
+		[[nodiscard]] inline auto operator->(this Self& self) noexcept -> decltype(auto)
 		{
-			return std::addressof(value());
+			return std::addressof(self.value());
 		}
 
 		[[nodiscard]] inline auto getLockGuard() & noexcept -> auto&
@@ -42,14 +44,16 @@ export namespace CppUtils::Thread
 			m_value{std::cref(value)}
 		{}
 
-		[[nodiscard]] inline auto value() & noexcept -> const T&
+		template<class Self>
+		[[nodiscard]] inline auto value(this Self& self) noexcept -> decltype(auto)
 		{
-			return m_value.get();
+			return self.m_value.get();
 		}
 
-		[[nodiscard]] inline auto operator->() & noexcept -> const T*
+		template<class Self>
+		[[nodiscard]] inline auto operator->(this Self& self) noexcept -> decltype(auto)
 		{
-			return std::addressof(value());
+			return std::addressof(self.value());
 		}
 
 		[[nodiscard]] inline auto getLockGuard() & noexcept -> auto&

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,16 @@ export namespace CppUtils::Thread`
`13`	`13`	`m_value{std::ref(value)}`
`14`	`14`	`{}`
`15`	`15`
`16`		`- [[nodiscard]] inline auto value() & noexcept -> T&`
	`16`	`+ template<class Self>`
	`17`	`+ [[nodiscard]] inline auto value(this Self& self) noexcept -> decltype(auto)`
`17`	`18`	`{`
`18`		`- return m_value.get();`
	`19`	`+ return self.m_value.get();`
`19`	`20`	`}`
`20`	`21`
`21`		`- [[nodiscard]] inline auto operator->() & noexcept -> T*`
	`22`	`+ template<class Self>`
	`23`	`+ [[nodiscard]] inline auto operator->(this Self& self) noexcept -> decltype(auto)`
`22`	`24`	`{`
`23`		`- return std::addressof(value());`
	`25`	`+ return std::addressof(self.value());`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`[[nodiscard]] inline auto getLockGuard() & noexcept -> auto&`
`@@ -42,14 +44,16 @@ export namespace CppUtils::Thread`
`42`	`44`	`m_value{std::cref(value)}`
`43`	`45`	`{}`
`44`	`46`
`45`		`- [[nodiscard]] inline auto value() & noexcept -> const T&`
	`47`	`+ template<class Self>`
	`48`	`+ [[nodiscard]] inline auto value(this Self& self) noexcept -> decltype(auto)`
`46`	`49`	`{`
`47`		`- return m_value.get();`
	`50`	`+ return self.m_value.get();`
`48`	`51`	`}`
`49`	`52`
`50`		`- [[nodiscard]] inline auto operator->() & noexcept -> const T*`
	`53`	`+ template<class Self>`
	`54`	`+ [[nodiscard]] inline auto operator->(this Self& self) noexcept -> decltype(auto)`
`51`	`55`	`{`
`52`		`- return std::addressof(value());`
	`56`	`+ return std::addressof(self.value());`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`[[nodiscard]] inline auto getLockGuard() & noexcept -> auto&`