diff options
Diffstat (limited to 'cpp/src/qpid/broker')
33 files changed, 68 insertions, 164 deletions
diff --git a/cpp/src/qpid/broker/AsyncResultHandle.cpp b/cpp/src/qpid/broker/AsyncResultHandle.cpp index 1d42b6096f..b95c50b423 100644 --- a/cpp/src/qpid/broker/AsyncResultHandle.cpp +++ b/cpp/src/qpid/broker/AsyncResultHandle.cpp @@ -21,10 +21,10 @@ * \file AsyncResultHandle.cpp */ -#include "AsyncResultHandle.h" +#include "qpid/broker/AsyncResultHandle.h" -#include "AsyncResultHandleImpl.h" -#include "PrivateImplRef.h" +#include "qpid/broker/AsyncResultHandleImpl.h" +#include "qpid/broker/PrivateImplRef.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/AsyncResultHandle.h b/cpp/src/qpid/broker/AsyncResultHandle.h index cf0fea5a06..39a9ccc6ff 100644 --- a/cpp/src/qpid/broker/AsyncResultHandle.h +++ b/cpp/src/qpid/broker/AsyncResultHandle.h @@ -24,7 +24,7 @@ #ifndef qpid_broker_AsyncResultHandle_h_ #define qpid_broker_AsyncResultHandle_h_ -#include "Handle.h" +#include "qpid/broker/Handle.h" #include <boost/shared_ptr.hpp> #include <string> diff --git a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp index 2239902566..c81430b19c 100644 --- a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp +++ b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp @@ -21,7 +21,7 @@ * \file AsyncResultHandleImpl.cpp */ -#include "AsyncResultHandleImpl.h" +#include "qpid/broker/AsyncResultHandleImpl.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/AsyncResultHandleImpl.h b/cpp/src/qpid/broker/AsyncResultHandleImpl.h index 4fe6d1248c..a53f75c9b4 100644 --- a/cpp/src/qpid/broker/AsyncResultHandleImpl.h +++ b/cpp/src/qpid/broker/AsyncResultHandleImpl.h @@ -24,8 +24,7 @@ #ifndef qpid_broker_AsyncResultHandleImpl_h_ #define qpid_broker_AsyncResultHandleImpl_h_ -#include "AsyncStore.h" - +#include "qpid/broker/AsyncStore.h" #include "qpid/RefCounted.h" namespace qpid { diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp index 9f8188f8c7..6f20a6816c 100644 --- a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp +++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp @@ -21,10 +21,9 @@ * \file AsyncResultQueueImpl.cpp */ -#include "AsyncResultQueueImpl.h" - -#include "AsyncResultHandle.h" +#include "qpid/broker/AsyncResultQueueImpl.h" +#include "qpid/broker/AsyncResultHandle.h" #include "qpid/log/Statement.h" namespace qpid { diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.h b/cpp/src/qpid/broker/AsyncResultQueueImpl.h index 805057400f..2e7eab1590 100644 --- a/cpp/src/qpid/broker/AsyncResultQueueImpl.h +++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.h @@ -24,8 +24,7 @@ #ifndef qpid_broker_AsyncResultQueueImpl_h_ #define qpid_broker_AsyncResultQueueImpl_h_ -#include "AsyncStore.h" - +#include "qpid/broker/AsyncStore.h" #include "qpid/sys/PollableQueue.h" namespace qpid { diff --git a/cpp/src/qpid/broker/ConfigHandle.cpp b/cpp/src/qpid/broker/ConfigHandle.cpp index 17dfbd7369..7b520e4234 100644 --- a/cpp/src/qpid/broker/ConfigHandle.cpp +++ b/cpp/src/qpid/broker/ConfigHandle.cpp @@ -21,10 +21,9 @@ * \file ConfigHandle.cpp */ -#include "ConfigHandle.h" - -#include "PrivateImplRef.h" +#include "qpid/broker/ConfigHandle.h" +#include "qpid/broker/PrivateImplRef.h" #include "qpid/asyncStore/ConfigHandleImpl.h" namespace qpid { diff --git a/cpp/src/qpid/broker/ConfigHandle.h b/cpp/src/qpid/broker/ConfigHandle.h index 3010018421..a12fb4ac85 100644 --- a/cpp/src/qpid/broker/ConfigHandle.h +++ b/cpp/src/qpid/broker/ConfigHandle.h @@ -24,9 +24,8 @@ #ifndef qpid_broker_ConfigHandle_h_ #define qpid_broker_ConfigHandle_h_ -#include "Handle.h" - #include "qpid/asyncStore/AsyncStoreHandle.h" +#include "qpid/broker/Handle.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/broker/EnqueueHandle.cpp b/cpp/src/qpid/broker/EnqueueHandle.cpp index b305da4105..daaba8a0a9 100644 --- a/cpp/src/qpid/broker/EnqueueHandle.cpp +++ b/cpp/src/qpid/broker/EnqueueHandle.cpp @@ -21,11 +21,10 @@ * \file EnqueueHandle.cpp */ -#include "EnqueueHandle.h" - -#include "PrivateImplRef.h" +#include "qpid/broker/EnqueueHandle.h" #include "qpid/asyncStore/EnqueueHandleImpl.h" +#include "qpid/broker/PrivateImplRef.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/EnqueueHandle.h b/cpp/src/qpid/broker/EnqueueHandle.h index 63872bb3b3..5f87581eb1 100644 --- a/cpp/src/qpid/broker/EnqueueHandle.h +++ b/cpp/src/qpid/broker/EnqueueHandle.h @@ -24,9 +24,8 @@ #ifndef qpid_broker_EnqueueHandle_h_ #define qpid_broker_EnqueueHandle_h_ -#include "Handle.h" - #include "qpid/asyncStore/AsyncStoreHandle.h" +#include "qpid/broker/Handle.h" namespace qpid { namespace asyncStore { diff --git a/cpp/src/qpid/broker/EventHandle.cpp b/cpp/src/qpid/broker/EventHandle.cpp index 84934415b5..eaf599eac5 100644 --- a/cpp/src/qpid/broker/EventHandle.cpp +++ b/cpp/src/qpid/broker/EventHandle.cpp @@ -21,11 +21,10 @@ * \file EventHandle.cpp */ -#include "EventHandle.h" - -#include "PrivateImplRef.h" +#include "qpid/broker/EventHandle.h" #include "qpid/asyncStore/EventHandleImpl.h" +#include "qpid/broker/PrivateImplRef.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/EventHandle.h b/cpp/src/qpid/broker/EventHandle.h index d73cf1e689..10e45310aa 100644 --- a/cpp/src/qpid/broker/EventHandle.h +++ b/cpp/src/qpid/broker/EventHandle.h @@ -24,9 +24,8 @@ #ifndef qpid_broker_EventHandle_h_ #define qpid_broker_EventHandle_h_ -#include "Handle.h" - #include "qpid/asyncStore/AsyncStoreHandle.h" +#include "qpid/broker/Handle.h" #include <string> diff --git a/cpp/src/qpid/broker/SimpleDeliverable.cpp b/cpp/src/qpid/broker/SimpleDeliverable.cpp index 7037a377c5..9e2d47b73d 100644 --- a/cpp/src/qpid/broker/SimpleDeliverable.cpp +++ b/cpp/src/qpid/broker/SimpleDeliverable.cpp @@ -21,7 +21,7 @@ * \file SimpleDeliverable.cpp */ -#include "SimpleDeliverable.h" +#include "qpid/broker/SimpleDeliverable.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp b/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp index b71df6975b..62ca681344 100644 --- a/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp +++ b/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp @@ -21,12 +21,12 @@ * \file SimpleDeliveryRecord.cpp */ -#include "SimpleDeliveryRecord.h" +#include "qpid/broker/SimpleDeliveryRecord.h" -#include "SimpleConsumer.h" -#include "SimpleMessage.h" -#include "SimpleQueue.h" -#include "SimpleQueuedMessage.h" +#include "qpid/broker/SimpleConsumer.h" +#include "qpid/broker/SimpleMessage.h" +#include "qpid/broker/SimpleQueue.h" +#include "qpid/broker/SimpleQueuedMessage.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/SimpleMessage.cpp b/cpp/src/qpid/broker/SimpleMessage.cpp index 3a85ca9ae4..2e81957a2a 100644 --- a/cpp/src/qpid/broker/SimpleMessage.cpp +++ b/cpp/src/qpid/broker/SimpleMessage.cpp @@ -21,7 +21,7 @@ * \file SimpleMessage.cpp */ -#include "SimpleMessage.h" +#include "qpid/broker/SimpleMessage.h" #include <string.h> // memcpy() @@ -37,74 +37,13 @@ SimpleMessage::SimpleMessage(const char* msgData, m_persistentContext(persistentContext) {} - -/* -SimpleMessage::SimpleMessage(const char* msgData, - const uint32_t msgSize) : - m_persistenceId(0ULL), - m_msg(msgData, static_cast<size_t>(msgSize)), - m_store(0), - m_msgHandle(MessageHandle()) -{} - -SimpleMessage::SimpleMessage(const char* msgData, - const uint32_t msgSize, - AsyncStore* store) : - m_persistenceId(0ULL), - m_msg(msgData, static_cast<size_t>(msgSize)), - m_store(store), - m_msgHandle(store ? store->createMessageHandle(this) : MessageHandle()) -{} -*/ - SimpleMessage::~SimpleMessage() {} -/* -const MessageHandle& -SimpleMessage::getHandle() const { - return m_persistentContext.getHandle(); -} - -MessageHandle& -SimpleMessage::getHandle() { - return m_persistentContext.getHandle(); -} -*/ - uint64_t SimpleMessage::contentSize() const { return static_cast<uint64_t>(m_msg.size()); } -/* -void -SimpleMessage::setPersistenceId(uint64_t id) const { - m_persistenceId = id; -} - -uint64_t -SimpleMessage::getPersistenceId() const { - return m_persistenceId; -} - -void -SimpleMessage::encode(qpid::framing::Buffer& buffer) const { - buffer.putRawData(m_msg); -} - -uint32_t -SimpleMessage::encodedSize() const { - return static_cast<uint32_t>(m_msg.size()); -} - -void -SimpleMessage::allDequeuesComplete() {} - -uint32_t -SimpleMessage::encodedHeaderSize() const { - return 0; -} -*/ bool SimpleMessage::isPersistent() const { return m_persistentContext.get() != 0; diff --git a/cpp/src/qpid/broker/SimpleMessage.h b/cpp/src/qpid/broker/SimpleMessage.h index 72ede431e0..ceff6f0b85 100644 --- a/cpp/src/qpid/broker/SimpleMessage.h +++ b/cpp/src/qpid/broker/SimpleMessage.h @@ -24,15 +24,13 @@ #ifndef qpid_broker_SimpleMessage_h_ #define qpid_broker_SimpleMessage_h_ -#include "AsyncStore.h" // DataSource -//#include "MessageHandle.h" -#include "PersistableMessage.h" +#include "qpid/broker/AsyncStore.h" // DataSource +#include "qpid/broker/PersistableMessage.h" namespace qpid { namespace broker { -class SimpleMessage: /*public PersistableMessage,*/ - public DataSource, +class SimpleMessage: public DataSource, public RefCounted { public: @@ -41,20 +39,8 @@ public: const uint32_t msgSize, boost::intrusive_ptr<PersistableMessage> persistentContext); virtual ~SimpleMessage(); -// const MessageHandle& getHandle() const; -// MessageHandle& getHandle(); uint64_t contentSize() const; -// // --- Interface Persistable --- -// virtual void setPersistenceId(uint64_t id) const; -// virtual uint64_t getPersistenceId() const; -// virtual void encode(qpid::framing::Buffer& buffer) const; -// virtual uint32_t encodedSize() const; -// -// // --- Interface PersistableMessage --- -// virtual void allDequeuesComplete(); -// virtual uint32_t encodedHeaderSize() const; - // Persistent operations bool isPersistent() const; boost::intrusive_ptr<PersistableMessage> getPersistentContext() const; @@ -64,12 +50,8 @@ public: virtual void write(char* target); private: -// mutable uint64_t m_persistenceId; const std::string m_msg; boost::intrusive_ptr<PersistableMessage> m_persistentContext; -// AsyncStore* m_store; - -// MessageHandle m_msgHandle; }; }} // namespace qpid::broker diff --git a/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp b/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp index a88258f5bc..e19ac154d0 100644 --- a/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp +++ b/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp @@ -21,9 +21,9 @@ * \file SimpleMessageAsyncContext.cpp */ -#include "SimpleMessageAsyncContext.h" +#include "qpid/broker/SimpleMessageAsyncContext.h" -#include "SimpleMessage.h" +#include "qpid/broker/SimpleMessage.h" #include <cassert> diff --git a/cpp/src/qpid/broker/SimpleMessageAsyncContext.h b/cpp/src/qpid/broker/SimpleMessageAsyncContext.h index e3975e790e..b9ab48f0dd 100644 --- a/cpp/src/qpid/broker/SimpleMessageAsyncContext.h +++ b/cpp/src/qpid/broker/SimpleMessageAsyncContext.h @@ -24,7 +24,7 @@ #ifndef qpid_broker_SimpleMessageAsyncContext_h_ #define qpid_broker_SimpleMessageAsyncContext_h_ -#include "AsyncStore.h" // BrokerAsyncContext +#include "qpid/broker/AsyncStore.h" // BrokerAsyncContext #include <boost/intrusive_ptr.hpp> #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qpid/broker/SimpleMessageDeque.cpp b/cpp/src/qpid/broker/SimpleMessageDeque.cpp index 0aadcfd94a..69cf7dd09c 100644 --- a/cpp/src/qpid/broker/SimpleMessageDeque.cpp +++ b/cpp/src/qpid/broker/SimpleMessageDeque.cpp @@ -21,9 +21,9 @@ * \file SimpleMessageDeque.cpp */ -#include "SimpleMessageDeque.h" +#include "qpid/broker/SimpleMessageDeque.h" -#include "SimpleQueuedMessage.h" +#include "qpid/broker/SimpleQueuedMessage.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/SimpleMessageDeque.h b/cpp/src/qpid/broker/SimpleMessageDeque.h index 5db0755a43..ce2cb475fd 100644 --- a/cpp/src/qpid/broker/SimpleMessageDeque.h +++ b/cpp/src/qpid/broker/SimpleMessageDeque.h @@ -29,7 +29,7 @@ #ifndef qpid_broker_SimpleMessageDeque_h_ #define qpid_broker_SimpleMessageDeque_h_ -#include "SimpleMessages.h" +#include "qpid/broker/SimpleMessages.h" #include "qpid/sys/Mutex.h" diff --git a/cpp/src/qpid/broker/SimpleQueue.cpp b/cpp/src/qpid/broker/SimpleQueue.cpp index e20edc1f92..9669f060d3 100644 --- a/cpp/src/qpid/broker/SimpleQueue.cpp +++ b/cpp/src/qpid/broker/SimpleQueue.cpp @@ -21,16 +21,16 @@ * \file SimpleQueue.cpp */ -#include "SimpleQueue.h" - -#include "AsyncResultHandle.h" -#include "QueueAsyncContext.h" -#include "SimpleConsumer.h" -#include "SimpleDeliveryRecord.h" -#include "SimpleMessage.h" -#include "SimpleMessageDeque.h" -#include "SimpleQueuedMessage.h" -#include "SimpleTxnBuffer.h" +#include "qpid/broker/SimpleQueue.h" + +#include "qpid/broker/AsyncResultHandle.h" +#include "qpid/broker/QueueAsyncContext.h" +#include "qpid/broker/SimpleConsumer.h" +#include "qpid/broker/SimpleDeliveryRecord.h" +#include "qpid/broker/SimpleMessage.h" +#include "qpid/broker/SimpleMessageDeque.h" +#include "qpid/broker/SimpleQueuedMessage.h" +#include "qpid/broker/SimpleTxnBuffer.h" #include <string.h> // memcpy() diff --git a/cpp/src/qpid/broker/SimpleQueuedMessage.cpp b/cpp/src/qpid/broker/SimpleQueuedMessage.cpp index f5135902a4..fe9e211aa3 100644 --- a/cpp/src/qpid/broker/SimpleQueuedMessage.cpp +++ b/cpp/src/qpid/broker/SimpleQueuedMessage.cpp @@ -21,10 +21,10 @@ * \file SimpleQueuedMessage.cpp */ -#include "SimpleQueuedMessage.h" +#include "qpid/broker/SimpleQueuedMessage.h" -#include "SimpleMessage.h" -#include "SimpleQueue.h" +#include "qpid/broker/SimpleMessage.h" +#include "qpid/broker/SimpleQueue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/SimpleQueuedMessage.h b/cpp/src/qpid/broker/SimpleQueuedMessage.h index 1172eb73f3..267f2efea9 100644 --- a/cpp/src/qpid/broker/SimpleQueuedMessage.h +++ b/cpp/src/qpid/broker/SimpleQueuedMessage.h @@ -24,8 +24,8 @@ #ifndef qpid_broker_SimpleQueuedMessage_h_ #define qpid_broker_SimpleQueuedMessage_h_ -#include "AsyncStore.h" -#include "EnqueueHandle.h" +#include "qpid/broker/AsyncStore.h" +#include "qpid/broker/EnqueueHandle.h" #include <boost/enable_shared_from_this.hpp> #include <boost/intrusive_ptr.hpp> diff --git a/cpp/src/qpid/broker/SimpleTxnAccept.cpp b/cpp/src/qpid/broker/SimpleTxnAccept.cpp index 343bbb54c7..d01624c5f4 100644 --- a/cpp/src/qpid/broker/SimpleTxnAccept.cpp +++ b/cpp/src/qpid/broker/SimpleTxnAccept.cpp @@ -21,10 +21,9 @@ * \file SimpleTxnAccept.cpp */ -#include "SimpleTxnAccept.h" - -#include "SimpleDeliveryRecord.h" +#include "qpid/broker/SimpleTxnAccept.h" +#include "qpid/broker/SimpleDeliveryRecord.h" #include "qpid/log/Statement.h" namespace qpid { diff --git a/cpp/src/qpid/broker/SimpleTxnAccept.h b/cpp/src/qpid/broker/SimpleTxnAccept.h index eb6963bc88..11b987588b 100644 --- a/cpp/src/qpid/broker/SimpleTxnAccept.h +++ b/cpp/src/qpid/broker/SimpleTxnAccept.h @@ -24,7 +24,7 @@ #ifndef tests_storePerftools_asyncPerf_SimpleTxnAccept_h_ #define tests_storePerftools_asyncPerf_SimpleTxnAccept_h_ -#include "SimpleTxnOp.h" +#include "qpid/broker/SimpleTxnOp.h" #include "boost/shared_ptr.hpp" #include <deque> diff --git a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp index 7995eae874..c49c08fd06 100644 --- a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp +++ b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp @@ -21,12 +21,11 @@ * \file SimpleTxnBuffer.cpp */ -#include "SimpleTxnBuffer.h" - -#include "AsyncResultHandle.h" -#include "SimpleTxnOp.h" -#include "TxnAsyncContext.h" +#include "qpid/broker/SimpleTxnBuffer.h" +#include "qpid/broker/AsyncResultHandle.h" +#include "qpid/broker/SimpleTxnOp.h" +#include "qpid/broker/TxnAsyncContext.h" #include "qpid/log/Statement.h" #include <uuid/uuid.h> diff --git a/cpp/src/qpid/broker/SimpleTxnBuffer.h b/cpp/src/qpid/broker/SimpleTxnBuffer.h index b2164cfeed..c5309cad27 100644 --- a/cpp/src/qpid/broker/SimpleTxnBuffer.h +++ b/cpp/src/qpid/broker/SimpleTxnBuffer.h @@ -24,8 +24,7 @@ #ifndef qpid_broker_SimpleTxnBuffer_h_ #define qpid_broker_SimpleTxnBuffer_h_ -#include "TxnHandle.h" - +#include "qpid/broker/TxnHandle.h" #include "qpid/sys/Mutex.h" #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qpid/broker/SimpleTxnPublish.cpp b/cpp/src/qpid/broker/SimpleTxnPublish.cpp index 6ad6a108ea..0da3e0c650 100644 --- a/cpp/src/qpid/broker/SimpleTxnPublish.cpp +++ b/cpp/src/qpid/broker/SimpleTxnPublish.cpp @@ -21,14 +21,12 @@ * \file SimpleTxnPublish.cpp */ -#include "SimpleTxnPublish.h" - -#include "SimpleMessage.h" -#include "SimpleQueue.h" -#include "SimpleQueuedMessage.h" +#include "qpid/broker/SimpleTxnPublish.h" +#include "qpid/broker/SimpleMessage.h" +#include "qpid/broker/SimpleQueue.h" +#include "qpid/broker/SimpleQueuedMessage.h" #include "qpid/log/Statement.h" -#include <boost/make_shared.hpp> namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/SimpleTxnPublish.h b/cpp/src/qpid/broker/SimpleTxnPublish.h index 0aaf8e4ba0..4bc69d94c7 100644 --- a/cpp/src/qpid/broker/SimpleTxnPublish.h +++ b/cpp/src/qpid/broker/SimpleTxnPublish.h @@ -24,8 +24,8 @@ #ifndef qpid_broker_SimpleTxnPublish_h_ #define qpid_broker_SimpleTxnPublish_h_ -#include "SimpleDeliverable.h" -#include "SimpleTxnOp.h" +#include "qpid/broker/SimpleDeliverable.h" +#include "qpid/broker/SimpleTxnOp.h" #include <boost/intrusive_ptr.hpp> #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qpid/broker/TxnAsyncContext.cpp b/cpp/src/qpid/broker/TxnAsyncContext.cpp index 720f191b64..3feb3dbaa2 100644 --- a/cpp/src/qpid/broker/TxnAsyncContext.cpp +++ b/cpp/src/qpid/broker/TxnAsyncContext.cpp @@ -21,7 +21,7 @@ * \file TransactionAsyncContext.cpp */ -#include "TxnAsyncContext.h" +#include "qpid/broker/TxnAsyncContext.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/TxnAsyncContext.h b/cpp/src/qpid/broker/TxnAsyncContext.h index 04f6ef76f5..39bdcdae0b 100644 --- a/cpp/src/qpid/broker/TxnAsyncContext.h +++ b/cpp/src/qpid/broker/TxnAsyncContext.h @@ -24,9 +24,8 @@ #ifndef qpid_broker_TxnAsyncContext_h_ #define qpid_broker_TxnAsyncContext_h_ -#include "AsyncStore.h" // qpid::broker::BrokerAsyncContext - #include "qpid/asyncStore/AsyncOperation.h" +#include "qpid/broker/AsyncStore.h" // qpid::broker::BrokerAsyncContext namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/TxnHandle.cpp b/cpp/src/qpid/broker/TxnHandle.cpp index a13718b750..a96490aaba 100644 --- a/cpp/src/qpid/broker/TxnHandle.cpp +++ b/cpp/src/qpid/broker/TxnHandle.cpp @@ -21,11 +21,10 @@ * \file TxnHandle.cpp */ -#include "TxnHandle.h" - -#include "PrivateImplRef.h" +#include "qpid/broker/TxnHandle.h" #include "qpid/asyncStore/TxnHandleImpl.h" +#include "qpid/broker/PrivateImplRef.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/TxnHandle.h b/cpp/src/qpid/broker/TxnHandle.h index f55d5b01d8..49e37a5871 100644 --- a/cpp/src/qpid/broker/TxnHandle.h +++ b/cpp/src/qpid/broker/TxnHandle.h @@ -24,9 +24,8 @@ #ifndef qpid_broker_TxnHandle_h_ #define qpid_broker_TxnHandle_h_ -#include "Handle.h" - #include "qpid/asyncStore/AsyncStoreHandle.h" +#include "qpid/broker/Handle.h" #include <string> |