client/BlockingQueue.h, sys/ConcurrentQueue.h: merged to sys/BlockingQueue.h

 - updated all users 	  

qpid/Exception.h: Removed unimplemented clone() function.


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

1 files changed, 17 insertions, 16 deletions

diff --git a/cpp/src/qpid/client/MessageQueue.h b/cpp/src/qpid/client/MessageQueue.h
index 1f5c492910..8ff537701f 100644
--- a/cpp/src/qpid/client/MessageQueue.h
+++ b/cpp/src/qpid/client/MessageQueue.h
@@ -22,28 +22,29 @@
 #ifndef _MessageQueue_
 #define _MessageQueue_
 #include <iostream>
-#include "BlockingQueue.h"
+#include "qpid/sys/BlockingQueue.h"
 #include "MessageListener.h"
 
 namespace qpid {
 namespace client {
 
-    /**
-     * A MessageListener implementation that simply queues up
-     * messages.
-     *
-     * \ingroup clientapi
-     */
-    class MessageQueue : public MessageListener, public BlockingQueue<Message>
+/**
+ * A MessageListener implementation that simply queues up
+ * messages.
+ *
+ * \ingroup clientapi
+ */
+class MessageQueue : public MessageListener,
+                     public sys::BlockingQueue<Message>
+{
+    std::queue<Message> messages;
+  public:
+    void received(Message& msg)
     {
-        std::queue<Message> messages;
-    public:
-        void received(Message& msg)
-        {
-            std::cout << "Adding message to queue: " << msg.getData() << std::endl;
-            push(msg);
-        }
-    };
+        std::cout << "Adding message to queue: " << msg.getData() << std::endl;
+        push(msg);
+    }
+};
 
 }
 }