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

[ntcore] Fix moving outgoing queue to new period (#5735)

Browse Source 
std::remove_if() is destructive--it can assume the removed elements are
not used, but NetworkOutgoingQueue needs them to stay intact to be moved
to a different queue. Use std::stable_partition() instead.
This commit is contained in:
Peter Johnson
2023-10-08 00:34:36 -07:00
committed by GitHub
parent be939cb636
commit 2b63e35ded
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.h
View File

@@ -163,8 +163,9 @@ void NetworkOutgoingQueue<MessageType>::SetPeriod(NT_Handle handle,
if (!created && infoIt->getSecond().queueIndex != queueIndex) {
// need to move any items from old queue to new queue
auto& oldMsgs = m_queues[infoIt->getSecond().queueIndex].msgs;
auto it = std::remove_if(oldMsgs.begin(), oldMsgs.end(),
[&](const auto& e) { return e.handle == handle; });
auto it = std::stable_partition(
oldMsgs.begin(), oldMsgs.end(),
[&](const auto& e) { return e.handle != handle; });
auto& newMsgs = m_queues[queueIndex].msgs;
for (auto i = it, end = oldMsgs.end(); i != end; ++i) {
newMsgs.emplace_back(std::move(*i));