Merge pull request #9344 from Pharap/fix-attach-function

0xc0170 · web-flow · commit f48c1a9b13b9 · 2019-01-18T11:44:26.000+01:00
Fix bug in templated attach function
diff --git a/features/unsupported/USBDevice/USBSerial/USBSerial.h b/features/unsupported/USBDevice/USBSerial/USBSerial.h
@@ -126,8 +126,8 @@ class USBSerial: public USBCDC, public Stream {
      */
     template<typename T>
     void attach(T* tptr, void (T::*mptr)(void)) {
-        if((mptr != NULL) && (tptr != NULL)) {
-            rx = Callback<void()>(mptr, tptr);
+        if((tptr != NULL) && (mptr != NULL)) {
+            rx = Callback<void()>(tptr, mptr);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ class USBSerial: public USBCDC, public Stream {`
`126`	`126`	`*/`
`127`	`127`	`template<typename T>`
`128`	`128`	`void attach(T* tptr, void (T::*mptr)(void)) {`
`129`		`- if((mptr != NULL) && (tptr != NULL)) {`
`130`		`- rx = Callback<void()>(mptr, tptr);`
	`129`	`+ if((tptr != NULL) && (mptr != NULL)) {`
	`130`	`+ rx = Callback<void()>(tptr, mptr);`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`