From 98cc985dbd81a84cd0b0a969c57cb941680ec81f Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Sun, 11 Oct 2009 23:22:08 +0000
Subject: Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@824198 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/examples/messaging/queue_sender.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'qpid/cpp/examples/messaging/queue_sender.cpp')

diff --git a/qpid/cpp/examples/messaging/queue_sender.cpp b/qpid/cpp/examples/messaging/queue_sender.cpp
index 637e7eb8e4..1396e26d5c 100644
--- a/qpid/cpp/examples/messaging/queue_sender.cpp
+++ b/qpid/cpp/examples/messaging/queue_sender.cpp
@@ -26,14 +26,10 @@
 
 #include <cstdlib>
 #include <iostream>
-
 #include <sstream>
 
 using namespace qpid::messaging;
 
-using std::stringstream;
-using std::string;
-
 int main(int argc, char** argv) {
     const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
     int count = argc>2 ? atoi(argv[2]) : 10;
@@ -45,14 +41,13 @@ int main(int argc, char** argv) {
 
 	// Now send some messages ...
 	for (int i=0; i<count; i++) {
-            Message message;
-            message.getContent() << "Message " << i;
-            sender.send(message);
+            std::stringstream content;
+            content << "Message " << i;
+            sender.send(Message(content.str()));
 	}
 	
-	// And send a final message to indicate termination.
-    	Message message("That's all, folks!");
-        sender.send(message);
+	// And send a final message to indicate termination.    	
+        sender.send(Message("That's all, folks!"));
         session.sync();
         connection.close();
         return 0;
-- 
cgit v1.2.1