Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2022'

Browse Source
This commit is contained in:
Peter Johnson
2021-05-09 14:15:40 -07:00
parent ba08baabb9 a3cd90dd71
commit 3cc2da3328
765 changed files with 5914 additions and 13714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/src/main/native/include/frc/smartdashboard/MechanismObject2d.h
View File

@@ -37,7 +37,7 @@ class MechanismObject2d {
*
* @param table the new table.
*/
virtual void UpdateEntries(std::shared_ptr<NetworkTable> table) = 0;
virtual void UpdateEntries(std::shared_ptr<nt::NetworkTable> table) = 0;
mutable wpi::mutex m_mutex;
@@ -82,7 +82,7 @@ class MechanismObject2d {
private:
std::string m_name;
wpi::StringMap<std::unique_ptr<MechanismObject2d>> m_objects;
std::shared_ptr<NetworkTable> m_table;
void Update(std::shared_ptr<NetworkTable> table);
std::shared_ptr<nt::NetworkTable> m_table;
void Update(std::shared_ptr<nt::NetworkTable> table);
};
} // namespace frc