Reapplied r793119

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793819 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 5 insertions, 5 deletions

diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
index 62b546b3eb..f5b0163c0f 100644
--- a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -49,7 +49,7 @@ public:
 };
 
 NullMessageStore::NullMessageStore() : nextPersistenceId(1) {
-    QPID_LOG(info, "No message store configured, persistence is disabled.")
+    QPID_LOG(info, "No message store configured, persistence is disabled.");
 }
 
 bool NullMessageStore::init(const Options* /*options*/) {return true;}
diff --git a/qpid/cpp/src/qpid/sys/DispatchHandle.h b/qpid/cpp/src/qpid/sys/DispatchHandle.h
index 916d4c641a..860665877c 100644
--- a/qpid/cpp/src/qpid/sys/DispatchHandle.h
+++ b/qpid/cpp/src/qpid/sys/DispatchHandle.h
@@ -38,14 +38,14 @@ class DispatchHandleRef;
  * you need to:
  * 
  * - Subclass IOHandle, in the constructor supply an appropriate
- *    IOHandlerPrivate object for the platform.
- *    
+ *   IOHandlerPrivate object for the platform.
+ *
  * - Construct a DispatchHandle passing it your IOHandle and 
  *   callback functions for read, write and disconnect events.
  *
  * - Ensure the DispatchHandle is not deleted until the poller is no longer using it.
  *   TODO: astitcher document DispatchHandleRef to simplify this.
- *   
+ *
  * When an event occurs on the handle, the poller calls the relevant callback and
  * stops watching that handle. Your callback can call rewatch() or related functions
  * to re-enable polling.
diff --git a/qpid/cpp/src/qpid/sys/Timer.h b/qpid/cpp/src/qpid/sys/Timer.h
index b5bf5d8a4c..c1f0ae89fc 100644
--- a/qpid/cpp/src/qpid/sys/Timer.h
+++ b/qpid/cpp/src/qpid/sys/Timer.h
@@ -71,7 +71,7 @@ bool operator<(const boost::intrusive_ptr<TimerTask>& a,
                 const boost::intrusive_ptr<TimerTask>& b);
 
 class Timer : private Runnable {
-    qpid::sys::Monitor monitor;            
+    qpid::sys::Monitor monitor;
     std::priority_queue<boost::intrusive_ptr<TimerTask> > tasks;
     qpid::sys::Thread runner;
     bool active;