Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +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

14
ntcore/src/main/native/cpp/ConnectionNotifier.h
View File

@@ -5,7 +5,8 @@
#ifndef NTCORE_CONNECTIONNOTIFIER_H_
#define NTCORE_CONNECTIONNOTIFIER_H_
#include "CallbackManager.h"
#include <wpi/CallbackManager.h>
#include "Handle.h"
#include "IConnectionNotifier.h"
#include "ntcore_cpp.h"
@@ -15,7 +16,8 @@ namespace nt {
namespace impl {
class ConnectionNotifierThread
: public CallbackThread<ConnectionNotifierThread, ConnectionNotification> {
: public wpi::CallbackThread<ConnectionNotifierThread,
ConnectionNotification> {
public:
explicit ConnectionNotifierThread(int inst) : m_inst(inst) {}
@@ -42,11 +44,11 @@ class ConnectionNotifierThread
class ConnectionNotifier
: public IConnectionNotifier,
public CallbackManager<ConnectionNotifier,
impl::ConnectionNotifierThread> {
public wpi::CallbackManager<ConnectionNotifier,
impl::ConnectionNotifierThread> {
friend class ConnectionNotifierTest;
friend class CallbackManager<ConnectionNotifier,
impl::ConnectionNotifierThread>;
friend class wpi::CallbackManager<ConnectionNotifier,
impl::ConnectionNotifierThread>;
public:
explicit ConnectionNotifier(int inst);