1 files changed, 3 insertions, 7 deletions
diff --git a/cpp/src/qpid/broker/PersistableMessage.h b/cpp/src/qpid/broker/PersistableMessage.h
index 59fa2e3d95..4f2e3abafa 100644
--- a/cpp/src/qpid/broker/PersistableMessage.h
+++ b/cpp/src/qpid/broker/PersistableMessage.h
@@ -28,7 +28,7 @@
 #include <boost/weak_ptr.hpp>
 #include "Persistable.h"
 #include "qpid/framing/amqp_types.h"
-#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Mutex.h"
 #include "PersistableQueue.h"
 
 namespace qpid {
@@ -42,8 +42,8 @@ class MessageStore;
 class PersistableMessage : public Persistable
 {
     typedef std::list< boost::weak_ptr<PersistableQueue> > syncList;
-    sys::Monitor asyncEnqueueLock;
-    sys::Monitor asyncDequeueLock;
+    sys::Mutex asyncEnqueueLock;
+    sys::Mutex asyncDequeueLock;
     sys::Mutex storeLock;
 	
     /**
@@ -93,8 +93,6 @@ class PersistableMessage : public Persistable
     
     bool isContentReleased() const;
 	
-    void waitForEnqueueComplete();
-
     bool isEnqueueComplete();
 
     void enqueueComplete();
@@ -107,8 +105,6 @@ class PersistableMessage : public Persistable
     
     void dequeueComplete();
 
-    void waitForDequeueComplete();
-
     void dequeueAsync(PersistableQueue::shared_ptr queue, MessageStore* _store);
 
     void dequeueAsync();