6 files changed, 11 insertions, 11 deletions
diff --git a/cpp/src/qpid/broker/MessageStore.h b/cpp/src/qpid/broker/MessageStore.h
index 36a7f8824e..303669c6bb 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/cpp/src/qpid/broker/MessageStore.h
@@ -40,11 +40,11 @@ public:
     /**
      * Record the existence of a durable queue
      */
-    virtual void create(const PersistableQueue& queue) = 0;
+    virtual void create(PersistableQueue& queue) = 0;
     /**
      * Destroy a durable queue
      */
-    virtual void destroy(const PersistableQueue& queue) = 0;
+    virtual void destroy(PersistableQueue& queue) = 0;
     
     /**
      * Record the existence of a durable exchange
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/cpp/src/qpid/broker/MessageStoreModule.cpp
index ba37852537..7cd1e6c831 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/cpp/src/qpid/broker/MessageStoreModule.cpp
@@ -28,12 +28,12 @@ MessageStoreModule::MessageStoreModule(const std::string& name) : store(name)
 {
 }
 
-void MessageStoreModule::create(const PersistableQueue& queue)
+void MessageStoreModule::create(PersistableQueue& queue)
 {
     store->create(queue);
 }
 
-void MessageStoreModule::destroy(const PersistableQueue& queue)
+void MessageStoreModule::destroy(PersistableQueue& queue)
 {
     store->destroy(queue);
 }
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/cpp/src/qpid/broker/MessageStoreModule.h
index 1254c3890b..271da92b1e 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/cpp/src/qpid/broker/MessageStoreModule.h
@@ -45,8 +45,8 @@ public:
     void abort(TransactionContext& txn);
     void collectPreparedXids(std::set<std::string>& xids);
 
-    void create(const PersistableQueue& queue);
-    void destroy(const PersistableQueue& queue);
+    void create(PersistableQueue& queue);
+    void destroy(PersistableQueue& queue);
     void create(const PersistableExchange& exchange);
     void destroy(const PersistableExchange& exchange);
     void bind(const PersistableExchange& exchange, const PersistableQueue& queue, 
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp
index 13f7dd3b9a..a86cb5f8c5 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -49,12 +49,12 @@ using namespace qpid::broker;
 
 NullMessageStore::NullMessageStore(bool _warn) : warn(_warn){}
 
-void NullMessageStore::create(const PersistableQueue& queue)
+void NullMessageStore::create(PersistableQueue& queue)
 {
     QPID_LOG(info, "Can't create durable queue '" << queue.getName() << "'. Persistence not enabled.");
 }
 
-void NullMessageStore::destroy(const PersistableQueue& queue)
+void NullMessageStore::destroy(PersistableQueue& queue)
 {
     QPID_LOG(info, "Can't destroy durable queue '" << queue.getName() << "'. Persistence not enabled.");
 }
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/cpp/src/qpid/broker/NullMessageStore.h
index 95f55f21b9..c27a0ad53a 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/cpp/src/qpid/broker/NullMessageStore.h
@@ -45,8 +45,8 @@ public:
     virtual void abort(TransactionContext& txn);
     virtual void collectPreparedXids(std::set<std::string>& xids);
 
-    virtual void create(const PersistableQueue& queue);
-    virtual void destroy(const PersistableQueue& queue);
+    virtual void create(PersistableQueue& queue);
+    virtual void destroy(PersistableQueue& queue);
     virtual void create(const PersistableExchange& exchange);
     virtual void destroy(const PersistableExchange& exchange);
 
diff --git a/cpp/src/qpid/broker/PersistableQueue.h b/cpp/src/qpid/broker/PersistableQueue.h
index f98bf7e871..8df3547f30 100644
--- a/cpp/src/qpid/broker/PersistableQueue.h
+++ b/cpp/src/qpid/broker/PersistableQueue.h
@@ -56,7 +56,7 @@ public:
     };
 
     inline void setExternalQueueStore(ExternalQueueStore* inst) {externalQueueStore = inst;};
-    inline ExternalQueueStore* getExternalQueueStore() {return externalQueueStore;};
+    inline ExternalQueueStore* getExternalQueueStore() const {return externalQueueStore;};
     
     PersistableQueue():externalQueueStore(NULL){
     };