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

[wpiutil] MulticastService cleanup (#3750)

Browse Source 
Fix duplicated constructors, and also use simpler utf conversion API on windows.
This commit is contained in:
Thad House
2021-12-02 21:06:55 -08:00
committed by GitHub
parent 1c4a8bfb66
commit 6c93365b0f
3 changed files with 70 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpiutil/src/main/native/windows/MulticastServiceResolver.cpp
View File

@@ -41,18 +41,17 @@ MulticastServiceResolver::MulticastServiceResolver(
return;
}
wpi::SmallVector<wpi::UTF16, 128> wideStorage;
wpi::SmallVector<wchar_t, 128> wideStorage;
if (wpi::ends_with_lower(serviceType, ".local")) {
wpi::convertUTF8ToUTF16String(serviceType, wideStorage);
wpi::sys::windows::UTF8ToUTF16(serviceType, wideStorage);
} else {
wpi::SmallString<128> storage;
storage.append(serviceType);
storage.append(".local");
wpi::convertUTF8ToUTF16String(storage.str(), wideStorage);
wpi::sys::windows::UTF8ToUTF16(storage.str(), wideStorage);
}
pImpl->serviceType = std::wstring{
reinterpret_cast<const wchar_t*>(wideStorage.data()), wideStorage.size()};
pImpl->serviceType = std::wstring{wideStorage.data(), wideStorage.size()};
}
MulticastServiceResolver::~MulticastServiceResolver() noexcept {