QPID-664: made changes suggested by Alan Conway, also moved 0-10 map/list codecs to common lib

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

1 files changed, 3 insertions, 4 deletions

diff --git a/qpid/cpp/examples/messaging/map_sender.cpp b/qpid/cpp/examples/messaging/map_sender.cpp
index dec918e836..8c85510717 100644
--- a/qpid/cpp/examples/messaging/map_sender.cpp
+++ b/qpid/cpp/examples/messaging/map_sender.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <qpid/messaging/Connection.h>
-#include <qpid/messaging/MapContent.h>
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Sender.h>
 #include <qpid/messaging/Session.h>
@@ -41,11 +40,11 @@ int main(int argc, char** argv) {
     Connection connection;
     try {
         connection.open(url);
-        Session session = connection.newSession();
+        Session session = connection.createSession();
         Sender sender = session.createSender("message_queue");
 
         Message message;
-        MapContent content(message);
+        Variant::Map content;
         content["id"] = 987654321;
         content["name"] = "Widget";
         content["price"] = 0.99;//bad use of floating point number, just an example!
@@ -55,7 +54,7 @@ int main(int argc, char** argv) {
         colours.push_back(Variant("white"));
         content["colours"] = colours;
         content["uuid"] = Uuid(true);
-        content.encode();
+        encode(content, message);
 	
         sender.send(message);
         session.sync();