jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we no longer use "emit" for method names, because it seems to conflict with the Qt library that uses emit as some sort of macro

This commit is contained in:
Emiel Bruijntjes 2016-09-10 20:36:06 +02:00
parent afb04a8f30
commit 173225071e
6 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/deferredconsumer.h
View File

@ -3,7 +3,7 @@
* *
* Deferred callback for consumers * Deferred callback for consumers
* *
* @copyright 2014 Copernica BV * @copyright 2014 - 2016 Copernica BV
*/ */
/** /**
@ -41,13 +41,12 @@ private:
virtual const std::shared_ptr<Deferred> &reportSuccess(const std::string &name) override; virtual const std::shared_ptr<Deferred> &reportSuccess(const std::string &name) override;
/** /**
* Emit a message * Announce that a message has been received
* * @param message The message to announce
* @param message The message to emit
* @param deliveryTag The delivery tag (for ack()ing) * @param deliveryTag The delivery tag (for ack()ing)
* @param redelivered Is this a redelivered message * @param redelivered Is this a redelivered message
*/ */
void emit(Message &&message, uint64_t deliveryTag, bool redelivered) const override; virtual void announce(Message &&message, uint64_t deliveryTag, bool redelivered) const override;
/** /**
* The channel implementation may call our * The channel implementation may call our

7
include/deferredconsumerbase.h
View File

@ -80,13 +80,12 @@ private:
void complete(); void complete();
/** /**
* Emit a message * Announce that a message has been received
* * @param message The message to announce
* @param message The message to emit
* @param deliveryTag The delivery tag (for ack()ing) * @param deliveryTag The delivery tag (for ack()ing)
* @param redelivered Is this a redelivered message * @param redelivered Is this a redelivered message
*/ */
virtual void emit(Message &&message, uint64_t deliveryTag, bool redelivered) const = 0; virtual void announce(Message &&message, uint64_t deliveryTag, bool redelivered) const = 0;
/** /**
* Frames may be processed * Frames may be processed

12
include/deferredget.h
View File

@ -2,7 +2,7 @@
* DeferredGet.h * DeferredGet.h
* *
* @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
* @copyright 2014 Copernica BV * @copyright 2014 - 2016 Copernica BV
*/ */
/** /**
@ -44,12 +44,11 @@ private:
/** /**
* Report success for a get operation * Report success for a get operation
*
* @param messagecount Number of messages left in the queue * @param messagecount Number of messages left in the queue
* @param deliveryTag Delivery tag of the message coming in * @param deliveryTag Delivery tag of the message coming in
* @param redelivered Was the message redelivered? * @param redelivered Was the message redelivered?
*/ */
const std::shared_ptr<Deferred> &reportSuccess(uint32_t messagecount, uint64_t deliveryTag, bool redelivered) override; virtual const std::shared_ptr<Deferred> &reportSuccess(uint32_t messagecount, uint64_t deliveryTag, bool redelivered) override;
/** /**
* Report success when queue was empty * Report success when queue was empty
@ -58,13 +57,12 @@ private:
virtual const std::shared_ptr<Deferred> &reportSuccess() const override; virtual const std::shared_ptr<Deferred> &reportSuccess() const override;
/** /**
* Emit a message * Announce that a message has been received
* * @param message The message to announce
* @param message The message to emit
* @param deliveryTag The delivery tag (for ack()ing) * @param deliveryTag The delivery tag (for ack()ing)
* @param redelivered Is this a redelivered message * @param redelivered Is this a redelivered message
*/ */
void emit(Message &&message, uint64_t deliveryTag, bool redelivered) const override; virtual void announce(Message &&message, uint64_t deliveryTag, bool redelivered) const override;
/** /**
* The channel implementation may call our * The channel implementation may call our

9
src/deferredconsumer.cpp
View File

@ -3,7 +3,7 @@
* *
* Implementation file for the DeferredConsumer class * Implementation file for the DeferredConsumer class
* *
* @copyright 2014 Copernica BV * @copyright 2014 - 2016 Copernica BV
*/ */
#include "includes.h" #include "includes.h"
@ -33,13 +33,12 @@ const std::shared_ptr<Deferred> &DeferredConsumer::reportSuccess(const std::stri
} }
/** /**
* Emit a message * Announce that a message was received
* * @param message The message to announce
* @param message The message to emit
* @param deliveryTag The delivery tag (for ack()ing) * @param deliveryTag The delivery tag (for ack()ing)
* @param redelivered Is this a redelivered message * @param redelivered Is this a redelivered message
*/ */
void DeferredConsumer::emit(Message &&message, uint64_t deliveryTag, bool redelivered) const void DeferredConsumer::announce(Message &&message, uint64_t deliveryTag, bool redelivered) const
{ {
// simply execute the message callback // simply execute the message callback
_messageCallback(std::move(message), deliveryTag, redelivered); _messageCallback(std::move(message), deliveryTag, redelivered);

4
src/deferredconsumerbase.cpp
View File

@ -119,8 +119,8 @@ void DeferredConsumerBase::complete()
// do we have a message? // do we have a message?
if (_message) if (_message)
{ {
// emit the message // announce the message
emit(std::move(*_message), _deliveryTag, _redelivered); announce(std::move(*_message), _deliveryTag, _redelivered);
// and destroy it // and destroy it
_message.reset(); _message.reset();

9
src/deferredget.cpp
View File

@ -4,7 +4,7 @@
* Implementation of the DeferredGet call * Implementation of the DeferredGet call
* *
* @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
* @copyright 2014 Copernica BV * @copyright 2014 - 2016 Copernica BV
*/ */
/** /**
@ -58,13 +58,12 @@ const std::shared_ptr<Deferred> &DeferredGet::reportSuccess() const
} }
/** /**
* Emit a message * Announce that a message has been received
* * @param message The message to announce
* @param message The message to emit
* @param deliveryTag The delivery tag (for ack()ing) * @param deliveryTag The delivery tag (for ack()ing)
* @param redelivered Is this a redelivered message * @param redelivered Is this a redelivered message
*/ */
void DeferredGet::emit(Message &&message, uint64_t deliveryTag, bool redelivered) const void DeferredGet::announce(Message &&message, uint64_t deliveryTag, bool redelivered) const
{ {
// monitor the channel // monitor the channel
Monitor monitor{ _channel }; Monitor monitor{ _channel };