falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix matching regression

This commit is contained in:
Léo Lam 2021-02-05 02:10:49 +01:00
parent f861dcaec3
commit c2426371f7
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/KingSystem/Utils/Thread/MessageReceiver.h
View File

@ -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; }

2
src/KingSystem/Utils/Thread/MessageTransceiverBase.h
View File

@ -35,7 +35,7 @@ public:
protected:
void registerReceiver(MessageReceiverEx& receiver) {
getDispatcher()->registerTransceiver(receiver);
mId = receiver.getId();
mId = receiver.MessageReceiver::getId();
}
void deregisterReceiver(MessageReceiverEx& receiver) {

16
src/KingSystem/Utils/Thread/MessageTransceiverCommon.h
View File

@ -9,8 +9,8 @@ template <class T>
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 <class T>
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 <class T>
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)