sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Communication: Avoid MessageFilter type punning in waitForMessageSync

Browse Source
This commit is contained in:
Paul Hollinsky
2021-12-02 15:00:13 -05:00
parent 78747aa899
commit f8b5710a6c
7 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/communication/communication.h
+2 -2
View File
@@ -60,7 +60,7 @@ public:
int addMessageCallback(const MessageCallback& cb);
bool removeMessageCallback(int id);
std::shared_ptr<Message> waitForMessageSync(
MessageFilter f = MessageFilter(),
const std::shared_ptr<MessageFilter>& f = {},
std::chrono::milliseconds timeout = std::chrono::milliseconds(50)) {
return waitForMessageSync([](){ return true; }, f, timeout);
}
@@ -68,7 +68,7 @@ public:
// Return false to bail early, in case your initial command failed.
std::shared_ptr<Message> waitForMessageSync(
std::function<bool(void)> onceWaitingDo,
MessageFilter f = MessageFilter(),
const std::shared_ptr<MessageFilter>& f = {},
std::chrono::milliseconds timeout = std::chrono::milliseconds(50));
std::function<std::unique_ptr<Packetizer>()> makeConfiguredPacketizer;
include/icsneo/communication/message/filter/main51messagefilter.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
// We still guarantee it's a Main51Message if it matches because of the dynamic_pointer_cast below
Main51MessageFilter(Command command) : command(command) { includeInternalInAny = true; }
bool match(const std::shared_ptr<Message>& message) const {
bool match(const std::shared_ptr<Message>& message) const override {
if(!MessageFilter::match(message)) {
//std::cout << "message filter did not match base for " << message->network << std::endl;
return false;