Fix callable Function<> class

audiobird · audiobird · commit 2f2ba142a3b0 · 2025-04-14T08:31:19.000-07:00
diff --git a/util/callable.hh b/util/callable.hh
@@ -104,19 +104,19 @@ public:
 
 	Ret call(Args... args) {
 		if (m_callback)
-			return m_callback(&m_data[0], std::forward<Args...>(args)...);
+			return m_callback(&m_data[0], std::forward<Args>(args)...);
 		return Ret();
 	}
 
 	Ret operator()(Args... args) {
-		return call(std::forward<Args...>(args)...);
+		return call(std::forward<Args>(args)...);
 	}
 
 private:
 	template<typename Callable>
 	static Ret invoke(void *object, Args... args) {
 		Callable &callable = *reinterpret_cast<Callable *>(object);
-		callable(std::forward<Args...>(args)...);
+		return callable(std::forward<Args>(args)...);
 	}
 
 	template<typename Callable>

Original file line number	Diff line number	Diff line change
`@@ -104,19 +104,19 @@ public:`
`104`	`104`
`105`	`105`	`Ret call(Args... args) {`
`106`	`106`	`if (m_callback)`
`107`		`- return m_callback(&m_data[0], std::forward<Args...>(args)...);`
	`107`	`+ return m_callback(&m_data[0], std::forward<Args>(args)...);`
`108`	`108`	`return Ret();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`Ret operator()(Args... args) {`
`112`		`- return call(std::forward<Args...>(args)...);`
	`112`	`+ return call(std::forward<Args>(args)...);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`private:`
`116`	`116`	`template<typename Callable>`
`117`	`117`	`static Ret invoke(void *object, Args... args) {`
`118`	`118`	`Callable &callable = reinterpret_cast<Callable >(object);`
`119`		`- callable(std::forward<Args...>(args)...);`
	`119`	`+ return callable(std::forward<Args>(args)...);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`template<typename Callable>`