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

[wpilibc] Fix MatchDataSender (#2892)

Browse Source 
The is_convertible test was always treating the input as bool.
Use is_same on T instead.
This commit is contained in:
Peter Johnson
2020-11-27 22:06:08 -08:00
committed by GitHub
parent e6a4254488
commit 5eb8cfd691
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpilibc/src/main/native/cpp/DriverStation.cpp
View File

@@ -32,19 +32,17 @@ class MatchDataSenderEntry {
public:
MatchDataSenderEntry(const std::shared_ptr<nt::NetworkTable>& table,
const wpi::Twine& key, const T& initialVal) {
static_assert(std::is_convertible<decltype(initialVal), bool>() ||
std::is_convertible<decltype(initialVal), double>() ||
std::is_convertible<decltype(initialVal), wpi::Twine>(),
"Invalid type for MatchDataSenderEntry - must be convertable "
"to bool, double or wpi::Twine");
static_assert(std::is_same_v<T, bool> || std::is_same_v<T, double> ||
std::is_same_v<T, std::string>,
"Invalid type for MatchDataSenderEntry - must be "
"to bool, double or std::string");
ntEntry = table->GetEntry(key);
if constexpr (std::is_convertible<decltype(initialVal), bool>()) {
if constexpr (std::is_same_v<T, bool>) {
ntEntry.ForceSetBoolean(initialVal);
} else if constexpr (std::is_convertible<decltype(initialVal), double>()) {
} else if constexpr (std::is_same_v<T, double>) {
ntEntry.ForceSetDouble(initialVal);
} else if constexpr (std::is_convertible<decltype(initialVal),
wpi::Twine>()) {
} else if constexpr (std::is_same_v<T, std::string>) {
ntEntry.ForceSetString(initialVal);
}
prevVal = initialVal;