Reordered functions for better code-compare to master

Author: dok-net

libraries/Ticker/src/Ticker.h

@@ -35,74 +35,74 @@ class Ticker
     typedef void (*callback_with_arg_t)(void*);
     typedef std::function<void(void)> callback_function_t;
 
-    void attach_ms(uint32_t milliseconds, callback_function_t callback)
+    void attach_scheduled(float seconds, callback_function_t callback)
     {
-        _callback_function = std::move(callback);
-        _attach_ms(milliseconds, true, _static_callback, this);
+        attach(seconds, [callback]() { schedule_function(callback); });
     }
 
     void attach(float seconds, callback_function_t callback)
     {
         attach_ms(1000UL * seconds, callback);
     }
 
-    void attach_scheduled(float seconds, callback_function_t callback)
+    void attach_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
     {
-        attach(seconds, [callback]() { schedule_function(callback); });
+        attach_ms(milliseconds, [callback]() { schedule_function(callback); });
     }
 
-    void attach_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
+    void attach_ms(uint32_t milliseconds, callback_function_t callback)
     {
-        attach_ms(milliseconds, [callback]() { schedule_function(callback); });
+        _callback_function = std::move(callback);
+        _attach_ms(milliseconds, true, _static_callback, this);
     }
 
     template<typename TArg>
-    void attach_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
+    void attach(float seconds, void (*callback)(TArg), TArg arg)
     {
         static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
-        _attach_ms(milliseconds, true, reinterpret_cast<callback_with_arg_t>(callback), reinterpret_cast<void*>(arg));
+        attach_ms(1000UL * seconds, callback, arg);
     }
 
     template<typename TArg>
-    void attach(float seconds, void (*callback)(TArg), TArg arg)
+    void attach_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
     {
         static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
-        attach_ms(1000UL * seconds, callback, arg);
+        _attach_ms(milliseconds, true, reinterpret_cast<callback_with_arg_t>(callback), reinterpret_cast<void*>(arg));
     }
 
-    void once_ms(uint32_t milliseconds, callback_function_t callback)
+    void once_scheduled(float seconds, callback_function_t callback)
     {
-        _callback_function = std::move(callback);
-        _attach_ms(milliseconds, false, _static_callback, this);
+        once(seconds, [callback]() { schedule_function(callback); });
     }
 
     void once(float seconds, callback_function_t callback)
     {
         once_ms(1000UL * seconds, callback);
     }
 
-    void once_scheduled(float seconds, callback_function_t callback)
+    void once_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
     {
-        once(seconds, [callback]() { schedule_function(callback); });
+        once_ms(milliseconds, [callback]() { schedule_function(callback); });
     }
 
-    void once_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
+    void once_ms(uint32_t milliseconds, callback_function_t callback)
     {
-        once_ms(milliseconds, [callback]() { schedule_function(callback); });
+        _callback_function = std::move(callback);
+        _attach_ms(milliseconds, false, _static_callback, this);
     }
 
     template<typename TArg>
-    void once_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
+    void once(float seconds, void (*callback)(TArg), TArg arg)
     {
         static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
-        _attach_ms(milliseconds, false, reinterpret_cast<callback_with_arg_t>(callback), reinterpret_cast<void*>(arg));
+        once_ms(1000UL * seconds, callback, arg);
     }
 
     template<typename TArg>
-    void once(float seconds, void (*callback)(TArg), TArg arg)
+    void once_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
     {
         static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
-        once_ms(1000UL * seconds, callback, arg);
+        _attach_ms(milliseconds, false, reinterpret_cast<callback_with_arg_t>(callback), reinterpret_cast<void*>(arg));
     }
 
     void detach();