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

wpiutil: Signal: make operator() const (#1721)

Browse Source 
This enables const-ness in uv::Handle ReportError() and Invoke() as well.
This commit is contained in:
Peter Johnson
2019-06-20 17:51:32 -07:00
committed by GitHub
parent b630b63ef0
commit 61426d08de
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpiutil/src/main/native/include/wpi/Signal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2018-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. */
@@ -570,7 +570,7 @@ public:
* @param a... arguments to emit
*/
template <typename... A>
void operator()(A && ... a) {
void operator()(A && ... a) const {
lock_type lock(m_mutex);
if (!m_block && m_func) m_func(std::forward<A>(a)...);
}
@@ -799,7 +799,7 @@ private:
private:
std::function<void(T...)> m_func;
Lockable m_mutex;
mutable Lockable m_mutex;
std::atomic<bool> m_block;
};

4
wpiutil/src/main/native/include/wpi/uv/Handle.h
View File

@@ -235,7 +235,7 @@ class Handle : public std::enable_shared_from_this<Handle> {
* Report an error.
* @param err Error code
*/
void ReportError(int err) { error(Error(err)); }
void ReportError(int err) const { error(Error(err)); }
protected:
explicit Handle(uv_handle_t* uv_handle) : m_uv_handle{uv_handle} {
@@ -250,7 +250,7 @@ class Handle : public std::enable_shared_from_this<Handle> {
static void DefaultFreeBuf(Buffer& buf);
template <typename F, typename... Args>
bool Invoke(F&& f, Args&&... args) {
bool Invoke(F&& f, Args&&... args) const {
auto err = std::forward<F>(f)(std::forward<Args>(args)...);
if (err < 0) ReportError(err);
return err == 0;