ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11391 from maciejbocianski/user_event_fix 

EvenQueue: fix template functions passing UserAllocatedEvent<...> as argument.
pull/11400/head
Anna Bridge 2019-09-03 10:48:13 +01:00 committed by GitHub
parent e001216b55 6124343755
commit 525d3cc2d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
events/EventQueue.h
View File

@ -167,8 +167,8 @@ public:
* @return true if event was successfully cancelled * @return true if event was successfully cancelled
* false if event was not cancelled (invalid queue or executing already begun) * false if event was not cancelled (invalid queue or executing already begun)
*/ */
template<typename... Args> template<typename F, typename A>
bool cancel(UserAllocatedEvent<Args...> *event) bool cancel(UserAllocatedEvent<F, A> *event)
{ {
if (event->_equeue != &_equeue) { if (event->_equeue != &_equeue) {
return false; return false;
@ -213,8 +213,8 @@ public:
* Undefined if id is invalid. * Undefined if id is invalid.
* *
*/ */
template<typename... Args> template<typename F, typename A>
int time_left(UserAllocatedEvent<Args...> *event) int time_left(UserAllocatedEvent<F, A> *event)
{ {
if (event && event->_equeue != &_equeue) { if (event && event->_equeue != &_equeue) {
return -1; return -1;