From d3e51fc3a07539858af2a6831aaa9537f6e33165 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 12 Nov 2018 13:23:19 +0000 Subject: [PATCH] events: fix coding style --- events/EventQueue.h | 25 ++++++++++++++++++++----- events/equeue/equeue.h | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/events/EventQueue.h b/events/EventQueue.h index c6930d4c50..02d3d31da1 100644 --- a/events/EventQueue.h +++ b/events/EventQueue.h @@ -185,7 +185,7 @@ public: - #if defined(DOXYGEN_ONLY) +#if defined(DOXYGEN_ONLY) /** Calls an event on the queue * * The specified callback will be executed in the context of the event @@ -266,8 +266,11 @@ public: * } * @endcode */ + // AStyle ignore, not handling correctly below + // *INDENT-OFF* template int call(T *obj, R (T::*method)(Args ...args), Args ...args); + // *INDENT-ON* /** Calls an event on the queue after a specified delay * @@ -346,8 +349,11 @@ public: * } * @endcode */ + // AStyle ignore, not handling correctly below + // *INDENT-OFF* template int call_in(int ms, T *obj, R (T::*method)(Args ...args), Args ...args); + // *INDENT-ON* /** Calls an event on the queue periodically * @@ -440,8 +446,11 @@ public: * } * @endcode */ + // AStyle ignore, not handling correctly below + // *INDENT-OFF* template int call_every(int ms, T *obj, R (T::*method)(Args ...args), Args ...args); + // *INDENT-ON* /** Creates an event bound to the event queue * @@ -483,8 +492,11 @@ public: * } * @endcode */ + // AStyle ignore, not handling correctly below + // *INDENT-OFF* template Event event(R (*func)(BoundArgs...), Args ...args); + // *INDENT-ON* /** Creates an event bound to the event queue * @@ -528,8 +540,11 @@ public: * } * @endcode */ + // AStyle ignore, not handling correctly below + // *INDENT-OFF* template Event event(T *obj, R (T::*method)(BoundArgs..., Args...), ContextArgs ...context_args); + // *INDENT-ON* /** Creates an event bound to the event queue * @@ -569,7 +584,7 @@ public: template Event event(mbed::Callback cb, ContextArgs ...context_args); - #else +#else /** Calls an event on the queue * @@ -2800,10 +2815,10 @@ public: */ template Event event(mbed::Callback cb, C0 c0, C1 c1, C2 c2, C3 c3, C4 c4); - #endif +#endif protected: - #if !defined(DOXYGEN_ONLY) +#if !defined(DOXYGEN_ONLY) template friend class Event; struct equeue _equeue; @@ -3380,7 +3395,7 @@ protected: f(c0, c1, c2, c3, c4, a0, a1, a2, a3, a4); } }; - #endif //!defined(DOXYGEN_ONLY) +#endif //!defined(DOXYGEN_ONLY) }; } diff --git a/events/equeue/equeue.h b/events/equeue/equeue.h index f0d8d2ad96..37013b3130 100644 --- a/events/equeue/equeue.h +++ b/events/equeue/equeue.h @@ -208,7 +208,7 @@ int equeue_timeleft(equeue_t *q, int id); // of hardware timers or even other event loops, allowing an event queue to // be effectively backgrounded. void equeue_background(equeue_t *queue, - void (*update)(void *timer, int ms), void *timer); + void (*update)(void *timer, int ms), void *timer); // Chain an event queue onto another event queue //