From 79267f9e606086cc8bb29942cc3753f4d5aee030 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 4 Apr 2021 14:34:11 -0700 Subject: [PATCH] [ntcore] Remove NetworkTable -> nt::NetworkTable shim --- .../include/networktables/NetworkTable.h | 5 --- .../src/test/native/cpp/NetworkTableTest.cpp | 38 +++++++++---------- .../main/native/cpp/livewindow/LiveWindow.cpp | 2 +- .../cpp/smartdashboard/SendableRegistry.cpp | 2 +- .../frc/smartdashboard/SendableRegistry.h | 2 +- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/ntcore/src/main/native/include/networktables/NetworkTable.h b/ntcore/src/main/native/include/networktables/NetworkTable.h index 3c32d7d1f3..682b3ee906 100644 --- a/ntcore/src/main/native/include/networktables/NetworkTable.h +++ b/ntcore/src/main/native/include/networktables/NetworkTable.h @@ -549,9 +549,4 @@ class NetworkTable final { } // namespace nt -// For backwards compatibility -#ifndef NAMESPACED_NT -using nt::NetworkTable; // NOLINT -#endif - #endif // NTCORE_NETWORKTABLES_NETWORKTABLE_H_ diff --git a/ntcore/src/test/native/cpp/NetworkTableTest.cpp b/ntcore/src/test/native/cpp/NetworkTableTest.cpp index ee3dbe7a9b..40c6f81d98 100644 --- a/ntcore/src/test/native/cpp/NetworkTableTest.cpp +++ b/ntcore/src/test/native/cpp/NetworkTableTest.cpp @@ -10,51 +10,51 @@ class NetworkTableTest : public ::testing::Test {}; TEST_F(NetworkTableTest, BasenameKey) { - EXPECT_EQ("simple", NetworkTable::BasenameKey("simple")); - EXPECT_EQ("simple", NetworkTable::BasenameKey("one/two/many/simple")); + EXPECT_EQ("simple", nt::NetworkTable::BasenameKey("simple")); + EXPECT_EQ("simple", nt::NetworkTable::BasenameKey("one/two/many/simple")); EXPECT_EQ("simple", - NetworkTable::BasenameKey("//////an/////awful/key////simple")); + nt::NetworkTable::BasenameKey("//////an/////awful/key////simple")); } TEST_F(NetworkTableTest, NormalizeKeySlash) { - EXPECT_EQ("/", NetworkTable::NormalizeKey("///")); - EXPECT_EQ("/no/normal/req", NetworkTable::NormalizeKey("/no/normal/req")); + EXPECT_EQ("/", nt::NetworkTable::NormalizeKey("///")); + EXPECT_EQ("/no/normal/req", nt::NetworkTable::NormalizeKey("/no/normal/req")); EXPECT_EQ("/no/leading/slash", - NetworkTable::NormalizeKey("no/leading/slash")); - EXPECT_EQ("/what/an/awful/key/", - NetworkTable::NormalizeKey("//////what////an/awful/////key///")); + nt::NetworkTable::NormalizeKey("no/leading/slash")); + EXPECT_EQ("/what/an/awful/key/", nt::NetworkTable::NormalizeKey( + "//////what////an/awful/////key///")); } TEST_F(NetworkTableTest, NormalizeKeyNoSlash) { - EXPECT_EQ("a", NetworkTable::NormalizeKey("a", false)); - EXPECT_EQ("a", NetworkTable::NormalizeKey("///a", false)); + EXPECT_EQ("a", nt::NetworkTable::NormalizeKey("a", false)); + EXPECT_EQ("a", nt::NetworkTable::NormalizeKey("///a", false)); EXPECT_EQ("leading/slash", - NetworkTable::NormalizeKey("/leading/slash", false)); + nt::NetworkTable::NormalizeKey("/leading/slash", false)); EXPECT_EQ("no/leading/slash", - NetworkTable::NormalizeKey("no/leading/slash", false)); - EXPECT_EQ( - "what/an/awful/key/", - NetworkTable::NormalizeKey("//////what////an/awful/////key///", false)); + nt::NetworkTable::NormalizeKey("no/leading/slash", false)); + EXPECT_EQ("what/an/awful/key/", + nt::NetworkTable::NormalizeKey("//////what////an/awful/////key///", + false)); } TEST_F(NetworkTableTest, GetHierarchyEmpty) { std::vector expected{"/"}; - ASSERT_EQ(expected, NetworkTable::GetHierarchy("")); + ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy("")); } TEST_F(NetworkTableTest, GetHierarchyRoot) { std::vector expected{"/"}; - ASSERT_EQ(expected, NetworkTable::GetHierarchy("/")); + ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy("/")); } TEST_F(NetworkTableTest, GetHierarchyNormal) { std::vector expected{"/", "/foo", "/foo/bar", "/foo/bar/baz"}; - ASSERT_EQ(expected, NetworkTable::GetHierarchy("/foo/bar/baz")); + ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy("/foo/bar/baz")); } TEST_F(NetworkTableTest, GetHierarchyTrailingSlash) { std::vector expected{"/", "/foo", "/foo/bar", "/foo/bar/"}; - ASSERT_EQ(expected, NetworkTable::GetHierarchy("/foo/bar/")); + ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy("/foo/bar/")); } TEST_F(NetworkTableTest, ContainsKey) { diff --git a/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp index cdfba922b6..1b749b6141 100644 --- a/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp +++ b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp @@ -154,7 +154,7 @@ void LiveWindow::UpdateValuesUnsafe() { return; } auto ssTable = m_impl->liveWindowTable->GetSubTable(cbdata.subsystem); - std::shared_ptr table; + std::shared_ptr table; // Treat name==subsystem as top level of subsystem if (cbdata.name == cbdata.subsystem) { table = ssTable; diff --git a/wpilibc/src/main/native/cpp/smartdashboard/SendableRegistry.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SendableRegistry.cpp index de40d0565a..15cc985bf5 100644 --- a/wpilibc/src/main/native/cpp/smartdashboard/SendableRegistry.cpp +++ b/wpilibc/src/main/native/cpp/smartdashboard/SendableRegistry.cpp @@ -352,7 +352,7 @@ Sendable* SendableRegistry::GetSendable(UID uid) { } void SendableRegistry::Publish(UID sendableUid, - std::shared_ptr table) { + std::shared_ptr table) { std::scoped_lock lock(m_impl->mutex); if (sendableUid == 0 || (sendableUid - 1) >= m_impl->components.size() || !m_impl->components[sendableUid - 1]) { diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/SendableRegistry.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableRegistry.h index e3fd0de9ef..e24c1934d2 100644 --- a/wpilibc/src/main/native/include/frc/smartdashboard/SendableRegistry.h +++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableRegistry.h @@ -285,7 +285,7 @@ class SendableRegistry { * @param sendableUid sendable unique id * @param table network table */ - void Publish(UID sendableUid, std::shared_ptr table); + void Publish(UID sendableUid, std::shared_ptr table); /** * Updates network table information from an object.