From 1624b9d17fa0e655fc215ff060ce8c94aa815d66 Mon Sep 17 00:00:00 2001 From: Martin Kojtal <0xc0170@gmail.com> Date: Thu, 27 Jun 2019 22:06:24 +0200 Subject: [PATCH] watchdog: fix astyle errors --- drivers/VirtualWatchdog.cpp | 7 +++---- drivers/Watchdog.h | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/VirtualWatchdog.cpp b/drivers/VirtualWatchdog.cpp index e996da925d..7c65f80070 100644 --- a/drivers/VirtualWatchdog.cpp +++ b/drivers/VirtualWatchdog.cpp @@ -30,8 +30,8 @@ VirtualWatchdog::VirtualWatchdog(uint32_t timeout, const char *const str): _name _next = NULL; _max_timeout = timeout; // start watchdog - Watchdog& watchdog = Watchdog::get_instance(); - watchdog.start(&VirtualWatchdog::process, Watchdog::elapsed_ms); + Watchdog &watchdog = Watchdog::get_instance(); + watchdog.start(&VirtualWatchdog::process, Watchdog::elapsed_ms); } VirtualWatchdog::~VirtualWatchdog() @@ -76,8 +76,7 @@ void VirtualWatchdog::add_to_list() void VirtualWatchdog::remove_from_list() { - VirtualWatchdog *cur_ptr = _first, - *prev_ptr = NULL; + VirtualWatchdog *cur_ptr = _first, *prev_ptr = NULL; while (cur_ptr != NULL) { if (cur_ptr == this) { if (cur_ptr == _first) { diff --git a/drivers/Watchdog.h b/drivers/Watchdog.h index d4f651c0bd..8681d963ef 100644 --- a/drivers/Watchdog.h +++ b/drivers/Watchdog.h @@ -54,7 +54,7 @@ public: /** As Watchdog might not stop ever, there is just one instance - we use single instance. * This ensures we keep Watchdog alive. To operate watchdog, use start/stop methods. - */ + */ static Watchdog &get_instance() { // Use this implementation of singleton (Meyer's) rather than the one that allocates @@ -108,7 +108,6 @@ public: void kick(); - private: Watchdog(); ~Watchdog(); @@ -125,7 +124,6 @@ private: */ SingletonPtr _ticker; #endif - }; } // namespace mbed