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

[ntcore] Move CallbackManager to wpiutil

Browse Source
This commit is contained in:
Peter Johnson
2021-01-25 00:08:43 -08:00
parent fdaec77594
commit 483beb6361
5 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ntcore/src/main/native/cpp/LoggerImpl.h
View File

@@ -5,7 +5,8 @@
#ifndef NTCORE_LOGGERIMPL_H_
#define NTCORE_LOGGERIMPL_H_
#include "CallbackManager.h"
#include <wpi/CallbackManager.h>
#include "Handle.h"
#include "ntcore_cpp.h"
@@ -13,15 +14,17 @@ namespace nt {
namespace impl {
struct LoggerListenerData
: public ListenerData<std::function<void(const LogMessage& msg)>> {
struct LoggerListenerData : public wpi::CallbackListenerData<
std::function<void(const LogMessage& msg)>> {
LoggerListenerData() = default;
LoggerListenerData(std::function<void(const LogMessage& msg)> callback_,
unsigned int min_level_, unsigned int max_level_)
: ListenerData(callback_), min_level(min_level_), max_level(max_level_) {}
: CallbackListenerData(callback_),
min_level(min_level_),
max_level(max_level_) {}
LoggerListenerData(unsigned int poller_uid_, unsigned int min_level_,
unsigned int max_level_)
: ListenerData(poller_uid_),
: CallbackListenerData(poller_uid_),
min_level(min_level_),
max_level(max_level_) {}
@@ -30,7 +33,7 @@ struct LoggerListenerData
};
class LoggerThread
: public CallbackThread<LoggerThread, LogMessage, LoggerListenerData> {
: public wpi::CallbackThread<LoggerThread, LogMessage, LoggerListenerData> {
public:
explicit LoggerThread(int inst) : m_inst(inst) {}
@@ -52,9 +55,9 @@ class LoggerThread
} // namespace impl
class LoggerImpl : public CallbackManager<LoggerImpl, impl::LoggerThread> {
class LoggerImpl : public wpi::CallbackManager<LoggerImpl, impl::LoggerThread> {
friend class LoggerTest;
friend class CallbackManager<LoggerImpl, impl::LoggerThread>;
friend class wpi::CallbackManager<LoggerImpl, impl::LoggerThread>;
public:
explicit LoggerImpl(int inst);