1 files changed, 1 insertions, 62 deletions
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;