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] Remove NetworkTable -> nt::NetworkTable shim

Browse Source
This commit is contained in:
Peter Johnson
2021-04-04 14:34:11 -07:00
parent 48ebe5736a
commit 79267f9e60
5 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
View File

@@ -154,7 +154,7 @@ void LiveWindow::UpdateValuesUnsafe() {
return;
}
auto ssTable = m_impl->liveWindowTable->GetSubTable(cbdata.subsystem);
std::shared_ptr<NetworkTable> table;
std::shared_ptr<nt::NetworkTable> table;
// Treat name==subsystem as top level of subsystem
if (cbdata.name == cbdata.subsystem) {
table = ssTable;

2
wpilibc/src/main/native/cpp/smartdashboard/SendableRegistry.cpp
View File

@@ -352,7 +352,7 @@ Sendable* SendableRegistry::GetSendable(UID uid) {
}
void SendableRegistry::Publish(UID sendableUid,
std::shared_ptr<NetworkTable> table) {
std::shared_ptr<nt::NetworkTable> table) {
std::scoped_lock lock(m_impl->mutex);
if (sendableUid == 0 || (sendableUid - 1) >= m_impl->components.size() ||
!m_impl->components[sendableUid - 1]) {