You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2008/05/13 19:59:55 UTC
svn commit: r655956 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/broker:
Message.h Queue.h RecoveryManagerImpl.cpp
Author: aconway
Date: Tue May 13 10:59:55 2008
New Revision: 655956
URL: http://svn.apache.org/viewvc?rev=655956&view=rev
Log:
Removed confusing broker::Message typedef intrusive_ptr<Message> shared_ptr
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?rev=655956&r1=655955&r2=655956&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Tue May 13 10:59:55 2008
@@ -47,8 +47,6 @@
class Message : public PersistableMessage {
public:
- typedef boost::intrusive_ptr<Message> shared_ptr;
-
Message(const framing::SequenceNumber& id = framing::SequenceNumber());
~Message();
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?rev=655956&r1=655955&r2=655956&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Tue May 13 10:59:55 2008
@@ -194,7 +194,7 @@
// 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);
};
}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp?rev=655956&r1=655955&r2=655956&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp Tue May 13 10:59:55 2008
@@ -46,7 +46,7 @@
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 @@
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));
}