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

cscore: Use more standard naming for Instance public variables

Browse Source
This commit is contained in:
Peter Johnson
2018-11-06 22:13:52 -08:00
parent 0abae17653
commit 19caeca990
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cscore/src/main/native/cpp/Instance.cpp
View File

@@ -38,7 +38,7 @@ static void def_log_func(unsigned int level, const char* file,
wpi::errs() << oss.str();
}
Instance::Instance() : telemetry(notifier), network_listener(logger, notifier) {
Instance::Instance() : telemetry(notifier), networkListener(logger, notifier) {
SetDefaultLogger();
}

4
cscore/src/main/native/cpp/Instance.h
View File

@@ -54,14 +54,14 @@ class Instance {
wpi::Logger logger;
Notifier notifier;
Telemetry telemetry;
NetworkListener network_listener;
NetworkListener networkListener;
private:
UnlimitedHandleResource<Handle, SourceData, Handle::kSource> m_sources;
UnlimitedHandleResource<Handle, SinkData, Handle::kSink> m_sinks;
public:
wpi::EventLoopRunner event_loop;
wpi::EventLoopRunner eventLoop;
std::pair<CS_Sink, std::shared_ptr<SinkData>> FindSink(const SinkImpl& sink);
std::pair<CS_Source, std::shared_ptr<SourceData>> FindSource(

2
cscore/src/main/native/cpp/cscore_cpp.cpp
View File

@@ -606,7 +606,7 @@ CS_Listener AddListener(std::function<void(const RawEvent& event)> callback,
int uid = inst.notifier.AddListener(callback, eventMask);
if ((eventMask & CS_NETWORK_INTERFACES_CHANGED) != 0) {
// start network interface event listener
inst.network_listener.Start();
inst.networkListener.Start();
if (immediateNotify) inst.notifier.NotifyNetworkInterfacesChanged();
}
if (immediateNotify) {