Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +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

15
ntcore/src/main/native/cpp/RpcServer.h
View File

@@ -7,10 +7,10 @@
#include <utility>
#include <wpi/CallbackManager.h>
#include <wpi/DenseMap.h>
#include <wpi/mutex.h>
#include "CallbackManager.h"
#include "Handle.h"
#include "IRpcServer.h"
#include "Log.h"
@@ -32,11 +32,11 @@ struct RpcNotifierData : public RpcAnswer {
};
using RpcListenerData =
ListenerData<std::function<void(const RpcAnswer& answer)>>;
wpi::CallbackListenerData<std::function<void(const RpcAnswer& answer)>>;
class RpcServerThread
: public CallbackThread<RpcServerThread, RpcAnswer, RpcListenerData,
RpcNotifierData> {
: public wpi::CallbackThread<RpcServerThread, RpcAnswer, RpcListenerData,
RpcNotifierData> {
public:
RpcServerThread(int inst, wpi::Logger& logger)
: m_inst(inst), m_logger(logger) {}
@@ -78,10 +78,11 @@ class RpcServerThread
} // namespace impl
class RpcServer : public IRpcServer,
public CallbackManager<RpcServer, impl::RpcServerThread> {
class RpcServer
: public IRpcServer,
public wpi::CallbackManager<RpcServer, impl::RpcServerThread> {
friend class RpcServerTest;
friend class CallbackManager<RpcServer, impl::RpcServerThread>;
friend class wpi::CallbackManager<RpcServer, impl::RpcServerThread>;
public:
RpcServer(int inst, wpi::Logger& logger);