diff options
| author | Alan Conway <aconway@apache.org> | 2008-05-13 17:59:55 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-05-13 17:59:55 +0000 |
| commit | 1b976cfb0c49d9352475fa1b45c36fff27f688ea (patch) | |
| tree | 2722e567a4f94efbca49a82e738b092cd681127c | |
| parent | 6107d64ed1458e4e3038fa25b9286837212f51b4 (diff) | |
| download | qpid-python-1b976cfb0c49d9352475fa1b45c36fff27f688ea.tar.gz | |
Removed confusing broker::Message typedef intrusive_ptr<Message> shared_ptr
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@655956 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/broker/Message.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/Queue.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/RecoveryManagerImpl.cpp | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h index e3a214dce1..ab13529adf 100644 --- a/cpp/src/qpid/broker/Message.h +++ b/cpp/src/qpid/broker/Message.h @@ -47,8 +47,6 @@ class Queue; class Message : public PersistableMessage { public: - typedef boost::intrusive_ptr<Message> shared_ptr; - Message(const framing::SequenceNumber& id = framing::SequenceNumber()); ~Message(); diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h index 355b2a5e41..f56cee0f22 100644 --- a/cpp/src/qpid/broker/Queue.h +++ b/cpp/src/qpid/broker/Queue.h @@ -194,7 +194,7 @@ namespace qpid { // Manageable entry points management::ManagementObject::shared_ptr GetManagementObject (void) const; management::Manageable::status_t - ManagementMethod (uint32_t methodId, management::Args& args); + ManagementMethod (uint32_t methodId, management::Args& args); }; } } diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp index c6ec573822..0f8c29f3b9 100644 --- a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp +++ b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp @@ -46,7 +46,7 @@ class RecoverableMessageImpl : public RecoverableMessage intrusive_ptr<Message> msg; const uint64_t stagingThreshold; public: - RecoverableMessageImpl(Message::shared_ptr& _msg, uint64_t _stagingThreshold) + RecoverableMessageImpl(const intrusive_ptr<Message>& _msg, uint64_t _stagingThreshold) : msg(_msg), stagingThreshold(_stagingThreshold) {} ~RecoverableMessageImpl() {}; void setPersistenceId(uint64_t id); @@ -122,7 +122,7 @@ RecoverableQueue::shared_ptr RecoveryManagerImpl::recoverQueue(framing::Buffer& RecoverableMessage::shared_ptr RecoveryManagerImpl::recoverMessage(framing::Buffer& buffer) { - Message::shared_ptr message(new Message()); + boost::intrusive_ptr<Message> message(new Message()); message->decodeHeader(buffer); return RecoverableMessage::shared_ptr(new RecoverableMessageImpl(message, stagingThreshold)); } |