1 files changed, 16 insertions, 0 deletions
diff --git a/cpp/src/qpid/client/ClientMessage.h b/cpp/src/qpid/client/ClientMessage.h
index fd33fbc830..19b0f867bc 100644
--- a/cpp/src/qpid/client/ClientMessage.h
+++ b/cpp/src/qpid/client/ClientMessage.h
@@ -23,8 +23,13 @@
  */
 #include <string>
 #include "qpid/framing/BasicHeaderProperties.h"
+#include "qpid/framing/FrameSet.h"
 #include "qpid/framing/MethodContent.h"
 
+#include "qpid/framing/BasicDeliverBody.h"
+#include "qpid/framing/BasicGetOkBody.h"
+#include "qpid/framing/MessageTransferBody.h"
+
 namespace qpid {
 namespace client {
 
@@ -55,6 +60,17 @@ class Message : public framing::BasicHeaderProperties, public framing::MethodCon
 
     const HeaderProperties& getMethodHeaders() const { return *this; }
 
+
+    //TODO: move this elsewhere (GRS 24/08/2007)
+    void populate(framing::FrameSet& frameset)
+    {
+        const BasicHeaderProperties* properties = frameset.getHeaders()->get<BasicHeaderProperties>();
+        if (properties) {
+            BasicHeaderProperties::copy<Message, BasicHeaderProperties>(*this, *properties);
+        }
+        frameset.getContent(data);
+    }
+
   private:
     std::string data;
     std::string destination;