From c2426371f710995aced40f41694355bdc8656861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Fri, 5 Feb 2021 02:10:49 +0100 Subject: [PATCH] Fix matching regression --- src/KingSystem/Utils/Thread/MessageReceiver.h | 2 +- .../Utils/Thread/MessageTransceiverBase.h | 2 +- .../Utils/Thread/MessageTransceiverCommon.h | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/KingSystem/Utils/Thread/MessageReceiver.h b/src/KingSystem/Utils/Thread/MessageReceiver.h index 640a6cd6..f3533eb1 100644 --- a/src/KingSystem/Utils/Thread/MessageReceiver.h +++ b/src/KingSystem/Utils/Thread/MessageReceiver.h @@ -12,7 +12,7 @@ class MessageReceiver { public: MessageReceiver(); virtual ~MessageReceiver(); - virtual MesTransceiverId* getId() final; + virtual MesTransceiverId* getId(); virtual int receive(const Message& message); virtual void receive(const MessageAck& ack); virtual void setQueueId(const u32& id) { mTransceiverId.queue_id = id; } diff --git a/src/KingSystem/Utils/Thread/MessageTransceiverBase.h b/src/KingSystem/Utils/Thread/MessageTransceiverBase.h index 8cfd32a0..6869bc20 100644 --- a/src/KingSystem/Utils/Thread/MessageTransceiverBase.h +++ b/src/KingSystem/Utils/Thread/MessageTransceiverBase.h @@ -35,7 +35,7 @@ public: protected: void registerReceiver(MessageReceiverEx& receiver) { getDispatcher()->registerTransceiver(receiver); - mId = receiver.getId(); + mId = receiver.MessageReceiver::getId(); } void deregisterReceiver(MessageReceiverEx& receiver) { diff --git a/src/KingSystem/Utils/Thread/MessageTransceiverCommon.h b/src/KingSystem/Utils/Thread/MessageTransceiverCommon.h index 798a355e..0e69d68c 100644 --- a/src/KingSystem/Utils/Thread/MessageTransceiverCommon.h +++ b/src/KingSystem/Utils/Thread/MessageTransceiverCommon.h @@ -9,8 +9,8 @@ template bool sendMessageImpl(T* transceiver, const MesTransceiverId& dest, const MessageType& type, void* user_data, bool ack) { MessageDispatcherBase* dispatcher = transceiver->getDispatcher(); - const bool ok = dispatcher->sendMessage(*transceiver->getReceiver()->getId(), dest, type, - user_data, ack, false); + const bool ok = dispatcher->sendMessage(*transceiver->getReceiver()->MessageReceiver::getId(), + dest, type, user_data, ack, false); if (ok) transceiver->getReceiver()->setFlag(ack); @@ -22,8 +22,8 @@ template bool sendMessageOnProcessingThreadImpl(T* transceiver, const MesTransceiverId& dest, const MessageType& type, void* user_data, bool ack) { MessageDispatcherBase* dispatcher = transceiver->getDispatcher(); - const bool ok = dispatcher->sendMessageOnProcessingThread(*transceiver->getReceiver()->getId(), - dest, type, user_data, ack, false); + const bool ok = dispatcher->sendMessageOnProcessingThread( + *transceiver->getReceiver()->MessageReceiver::getId(), dest, type, user_data, ack, false); if (ok) transceiver->getReceiver()->setFlag(ack); @@ -36,7 +36,7 @@ bool sendMessageImpl(T* transceiver, IMessageBroker& broker, const MessageType& void* user_data, bool ack) { MessageDispatcherBase* dispatcher = transceiver->getDispatcher(); const bool ok = - dispatcher->sendMessage(*transceiver->getReceiver()->getId(), + dispatcher->sendMessage(*transceiver->getReceiver()->MessageReceiver::getId(), *transceiver->getRegister(broker), type, user_data, ack, false); if (ok) { @@ -51,9 +51,9 @@ template bool sendMessageOnProcessingThreadImpl(T* transceiver, IMessageBroker& broker, const MessageType& type, void* user_data, bool ack) { MessageDispatcherBase* dispatcher = transceiver->getDispatcher(); - const bool ok = dispatcher->sendMessageOnProcessingThread(*transceiver->getReceiver()->getId(), - *transceiver->getRegister(broker), - type, user_data, ack, false); + const bool ok = dispatcher->sendMessageOnProcessingThread( + *transceiver->getReceiver()->MessageReceiver::getId(), *transceiver->getRegister(broker), + type, user_data, ack, false); if (ok) { for (int i = 0, n = broker.countTransceivers(); i < n; ++i)