Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove TimerEventHandler typedef from Notifier class (#1767)

Browse Source 
Using std::function<void()> directly makes it much clearer to the user
what kind of function Notifier expects. The Doxygen comments already say
what the function is used for, so the typedef just discards useful
information.
This commit is contained in:
Tyler Veness
2019-07-20 22:57:16 -07:00
committed by Peter Johnson
parent 0f6ef80ab2
commit dde61aad32
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpilibc/src/main/native/include/frc/Notifier.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -21,8 +21,6 @@
namespace frc {
using TimerEventHandler = std::function<void()>;
class Notifier : public ErrorBase {
public:
/**
@@ -31,7 +29,7 @@ class Notifier : public ErrorBase {
* @param handler The handler is called at the notification time which is set
* using StartSingle or StartPeriodic.
*/
explicit Notifier(TimerEventHandler handler);
explicit Notifier(std::function<void()> handler);
template <typename Callable, typename Arg, typename... Args>
Notifier(Callable&& f, Arg&& arg, Args&&... args)
@@ -51,7 +49,7 @@ class Notifier : public ErrorBase {
*
* @param handler Handler
*/
void SetHandler(TimerEventHandler handler);
void SetHandler(std::function<void()> handler);
/**
* Register for single event notification.
@@ -108,7 +106,7 @@ class Notifier : public ErrorBase {
std::atomic<HAL_NotifierHandle> m_notifier{0};
// Address of the handler
TimerEventHandler m_handler;
std::function<void()> m_handler;
// The absolute expiration time
double m_expirationTime = 0;