diff options
| author | Pavel Moravec <pmoravec@apache.org> | 2014-05-28 07:16:57 +0000 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@apache.org> | 2014-05-28 07:16:57 +0000 |
| commit | 6a7554a2ceb02bcc8f3f81f40d2421672aab60b9 (patch) | |
| tree | 2826acca3cfcdd6da65f9afae74d23db8a3877c8 /cpp/src/tests | |
| parent | 14a61e05779a40ae102e9ba1783d69bef968e527 (diff) | |
| download | qpid-python-6a7554a2ceb02bcc8f3f81f40d2421672aab60b9.tar.gz | |
QPID-5748: [C++ broker] Make Queue::purgeExpired more efficient; remove ExpiryPolicy
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1597931 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/MessageUtils.h | 2 | ||||
| -rw-r--r-- | cpp/src/tests/QueueTest.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/tests/MessageUtils.h b/cpp/src/tests/MessageUtils.h index 2c205da20f..f05b0d8b20 100644 --- a/cpp/src/tests/MessageUtils.h +++ b/cpp/src/tests/MessageUtils.h @@ -107,7 +107,7 @@ struct MessageUtils AMQFrame data((AMQContentBody(content))); msg->getFrames().append(data); } - if (ttl) msg->computeExpiration(new broker::ExpiryPolicy); + if (ttl) msg->computeExpiration(); return Message(msg, msg); } }; diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp index 99c6880b26..ee9d37e76d 100644 --- a/cpp/src/tests/QueueTest.cpp +++ b/cpp/src/tests/QueueTest.cpp @@ -30,7 +30,6 @@ #include "qpid/broker/ExchangeRegistry.h" #include "qpid/broker/QueueRegistry.h" #include "qpid/broker/NullMessageStore.h" -#include "qpid/broker/ExpiryPolicy.h" #include "qpid/framing/DeliveryProperties.h" #include "qpid/framing/FieldTable.h" #include "qpid/framing/MessageTransferBody.h" |