9 files changed, 29 insertions, 56 deletions

diff --git a/cpp/src/qpid/broker/AsyncResultHandle.cpp b/cpp/src/qpid/broker/AsyncResultHandle.cpp
index d2fa9ae3e0..1d42b6096f 100644
--- a/cpp/src/qpid/broker/AsyncResultHandle.cpp
+++ b/cpp/src/qpid/broker/AsyncResultHandle.cpp
@@ -32,49 +32,43 @@ namespace broker {
 typedef PrivateImplRef<AsyncResultHandle> PrivateImpl;
 
 AsyncResultHandle::AsyncResultHandle(AsyncResultHandleImpl* p) :
-            Handle<AsyncResultHandleImpl>()
+        Handle<AsyncResultHandleImpl>()
 {
     PrivateImpl::ctor(*this, p);
 }
 
 AsyncResultHandle::AsyncResultHandle(const AsyncResultHandle& r) :
-            Handle<AsyncResultHandleImpl>()
+        Handle<AsyncResultHandleImpl>()
 {
     PrivateImpl::copy(*this, r);
 }
 
-AsyncResultHandle::~AsyncResultHandle()
-{
+AsyncResultHandle::~AsyncResultHandle() {
     PrivateImpl::dtor(*this);
 }
 
 AsyncResultHandle&
-AsyncResultHandle::operator=(const AsyncResultHandle& r)
-{
+AsyncResultHandle::operator=(const AsyncResultHandle& r) {
     return PrivateImpl::assign(*this, r);
 }
 
 int
-AsyncResultHandle::getErrNo() const
-{
+AsyncResultHandle::getErrNo() const {
     return impl->getErrNo();
 }
 
 std::string
-AsyncResultHandle::getErrMsg() const
-{
+AsyncResultHandle::getErrMsg() const {
     return impl->getErrMsg();
 }
 
 boost::shared_ptr<BrokerAsyncContext>
-AsyncResultHandle::getBrokerAsyncContext() const
-{
+AsyncResultHandle::getBrokerAsyncContext() const {
     return impl->getBrokerAsyncContext();
 }
 
 void
-AsyncResultHandle::invokeAsyncResultCallback() const
-{
+AsyncResultHandle::invokeAsyncResultCallback() const {
     impl->getBrokerAsyncContext()->invokeCallback(this);
 }
 
diff --git a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
index c8950d8ff1..2239902566 100644
--- a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
+++ b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
@@ -45,24 +45,20 @@ AsyncResultHandleImpl::AsyncResultHandleImpl(const int errNo,
         m_bc(bc)
 {}
 
-AsyncResultHandleImpl::~AsyncResultHandleImpl()
-{}
+AsyncResultHandleImpl::~AsyncResultHandleImpl() {}
 
 int
-AsyncResultHandleImpl::getErrNo() const
-{
+AsyncResultHandleImpl::getErrNo() const {
     return m_errNo;
 }
 
 std::string
-AsyncResultHandleImpl::getErrMsg() const
-{
+AsyncResultHandleImpl::getErrMsg() const {
     return m_errMsg;
 }
 
 boost::shared_ptr<BrokerAsyncContext>
-AsyncResultHandleImpl::getBrokerAsyncContext() const
-{
+AsyncResultHandleImpl::getBrokerAsyncContext() const {
     return m_bc;
 }
 
diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
index ab408be9ca..9f8188f8c7 100644
--- a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
+++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
@@ -36,21 +36,18 @@ AsyncResultQueueImpl::AsyncResultQueueImpl(const boost::shared_ptr<qpid::sys::Po
     m_resQueue.start();
 }
 
-AsyncResultQueueImpl::~AsyncResultQueueImpl()
-{
+AsyncResultQueueImpl::~AsyncResultQueueImpl() {
     m_resQueue.stop();
 }
 
 void
-AsyncResultQueueImpl::submit(boost::shared_ptr<AsyncResultHandle> arh)
-{
+AsyncResultQueueImpl::submit(boost::shared_ptr<AsyncResultHandle> arh) {
     m_resQueue.push(arh);
 }
 
 // private
 AsyncResultQueueImpl::ResultQueue::Batch::const_iterator
-AsyncResultQueueImpl::handle(const ResultQueue::Batch& e)
-{
+AsyncResultQueueImpl::handle(const ResultQueue::Batch& e) {
     try {
         for (ResultQueue::Batch::const_iterator i = e.begin(); i != e.end(); ++i) {
             if ((*i)->isValid()) {
diff --git a/cpp/src/qpid/broker/ConfigHandle.cpp b/cpp/src/qpid/broker/ConfigHandle.cpp
index 6ac8ce6ace..17dfbd7369 100644
--- a/cpp/src/qpid/broker/ConfigHandle.cpp
+++ b/cpp/src/qpid/broker/ConfigHandle.cpp
@@ -44,14 +44,12 @@ ConfigHandle::ConfigHandle(const ConfigHandle& r) :
     PrivateImpl::copy(*this, r);
 }
 
-ConfigHandle::~ConfigHandle()
-{
+ConfigHandle::~ConfigHandle() {
     PrivateImpl::dtor(*this);
 }
 
 ConfigHandle&
-ConfigHandle::operator=(const ConfigHandle& r)
-{
+ConfigHandle::operator=(const ConfigHandle& r) {
     return PrivateImpl::assign(*this, r);
 }
 
diff --git a/cpp/src/qpid/broker/EnqueueHandle.cpp b/cpp/src/qpid/broker/EnqueueHandle.cpp
index aff8673524..b305da4105 100644
--- a/cpp/src/qpid/broker/EnqueueHandle.cpp
+++ b/cpp/src/qpid/broker/EnqueueHandle.cpp
@@ -44,14 +44,12 @@ EnqueueHandle::EnqueueHandle(const EnqueueHandle& r) :
     PrivateImpl::copy(*this, r);
 }
 
-EnqueueHandle::~EnqueueHandle()
-{
+EnqueueHandle::~EnqueueHandle() {
     PrivateImpl::dtor(*this);
 }
 
 EnqueueHandle&
-EnqueueHandle::operator=(const EnqueueHandle& r)
-{
+EnqueueHandle::operator=(const EnqueueHandle& r) {
     return PrivateImpl::assign(*this, r);
 }
 
diff --git a/cpp/src/qpid/broker/EventHandle.cpp b/cpp/src/qpid/broker/EventHandle.cpp
index 81f33b59a6..84934415b5 100644
--- a/cpp/src/qpid/broker/EventHandle.cpp
+++ b/cpp/src/qpid/broker/EventHandle.cpp
@@ -44,22 +44,19 @@ EventHandle::EventHandle(const EventHandle& r) :
     PrivateImpl::copy(*this, r);
 }
 
-EventHandle::~EventHandle()
-{
+EventHandle::~EventHandle() {
     PrivateImpl::dtor(*this);
 }
 
 EventHandle&
-EventHandle::operator=(const EventHandle& r)
-{
+EventHandle::operator=(const EventHandle& r) {
     return PrivateImpl::assign(*this, r);
 }
 
 // --- EventHandleImpl methods ---
 
 const std::string&
-EventHandle::getKey() const
-{
+EventHandle::getKey() const {
     return impl->getKey();
 }
 
diff --git a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
index d72a785c2a..cb9c54d2d4 100644
--- a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
+++ b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
@@ -238,8 +238,7 @@ SimpleTxnBuffer::getNumOps() const {
 
 // private
 void
-SimpleTxnBuffer::createLocalXid()
-{
+SimpleTxnBuffer::createLocalXid() {
     uuid_t uuid;
     {
         qpid::sys::ScopedLock<qpid::sys::Mutex> l(s_uuidMutex);
diff --git a/cpp/src/qpid/broker/TxnAsyncContext.cpp b/cpp/src/qpid/broker/TxnAsyncContext.cpp
index 527cb4741f..720f191b64 100644
--- a/cpp/src/qpid/broker/TxnAsyncContext.cpp
+++ b/cpp/src/qpid/broker/TxnAsyncContext.cpp
@@ -34,24 +34,20 @@ TxnAsyncContext::TxnAsyncContext(SimpleTxnBuffer* const tb,
         m_arq(arq)
 {}
 
-TxnAsyncContext::~TxnAsyncContext()
-{}
+TxnAsyncContext::~TxnAsyncContext() {}
 
 SimpleTxnBuffer*
-TxnAsyncContext::getTxnBuffer() const
-{
+TxnAsyncContext::getTxnBuffer() const {
     return m_tb;
 }
 
 AsyncResultQueue*
-TxnAsyncContext::getAsyncResultQueue() const
-{
+TxnAsyncContext::getAsyncResultQueue() const {
     return m_arq;
 }
 
 void
-TxnAsyncContext::invokeCallback(const AsyncResultHandle* const arh) const
-{
+TxnAsyncContext::invokeCallback(const AsyncResultHandle* const arh) const {
     if (m_rcb) {
         m_rcb(arh);
     }
diff --git a/cpp/src/qpid/broker/TxnHandle.cpp b/cpp/src/qpid/broker/TxnHandle.cpp
index f8977b2132..a13718b750 100644
--- a/cpp/src/qpid/broker/TxnHandle.cpp
+++ b/cpp/src/qpid/broker/TxnHandle.cpp
@@ -44,14 +44,12 @@ TxnHandle::TxnHandle(const TxnHandle& r) :
     PrivateImpl::copy(*this, r);
 }
 
-TxnHandle::~TxnHandle()
-{
+TxnHandle::~TxnHandle() {
     PrivateImpl::dtor(*this);
 }
 
 TxnHandle&
-TxnHandle::operator=(const TxnHandle& r)
-{
+TxnHandle::operator=(const TxnHandle& r) {
     return PrivateImpl::assign(*this, r);
 }