Issue 10316: Workaround bug in getStdFunctionAddress

LeeLeahy2 · LeeLeahy2 · commit 004594a62407 · 2024-09-09T14:30:19.000-10:00
diff --git a/libraries/Network/src/NetworkEvents.cpp b/libraries/Network/src/NetworkEvents.cpp
@@ -225,10 +225,8 @@ void NetworkEvents::removeEvent(NetworkEventCb cbEvent, arduino_event_id_t event
   }
 }
 
-template<typename T, typename... U> static size_t getStdFunctionAddress(std::function<T(U...)> f) {
-  typedef T(fnType)(U...);
-  fnType **fnPointer = f.template target<fnType *>();
-  return (size_t)*fnPointer;
+static size_t getStdFunctionAddress(NetworkEventFuncCb cbEvent) {
+  return *(size_t *)(void *)&cbEvent;
 }
 
 void NetworkEvents::removeEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event) {

Original file line number	Diff line number	Diff line change
`@@ -225,10 +225,8 @@ void NetworkEvents::removeEvent(NetworkEventCb cbEvent, arduino_event_id_t event`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`
`228`		`-template<typename T, typename... U> static size_t getStdFunctionAddress(std::function<T(U...)> f) {`
`229`		`- typedef T(fnType)(U...);`
`230`		`- fnType *fnPointer = f.template target<fnType >();`
`231`		`- return (size_t)*fnPointer;`
	`228`	`+static size_t getStdFunctionAddress(NetworkEventFuncCb cbEvent) {`
	`229`	`+ return (size_t )(void *)&cbEvent;`
`232`	`230`	`}`
`233`	`231`
`234`	`232`	`void NetworkEvents::removeEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event) {`