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, 3 insertions, 3 deletions

diff --git a/cpp/src/tests/ConcurrentQueue.cpp b/cpp/src/tests/ConcurrentQueue.cpp
index 39155b4ff2..c6ca40e897 100644
--- a/cpp/src/tests/ConcurrentQueue.cpp
+++ b/cpp/src/tests/ConcurrentQueue.cpp
@@ -20,10 +20,10 @@
  */
 
 /**@file
- * Compare alternative implementations for ConcurrentQueue.
+ * Compare alternative implementations for BlockingQueue.
  */
 
-#include "qpid/sys/ConcurrentQueue.h"
+#include "qpid/sys/BlockingQueue.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Runnable.h"
@@ -83,7 +83,7 @@ template <class T> class DualVectorDualLockQueue {
     typename std::vector<T>::iterator popIter;
 };
 
-template <class T> struct LockedDequeQueue : public ConcurrentQueue<T> {
+template <class T> struct LockedDequeQueue : public BlockingQueue<T> {
     /** size_t ignored, can't pre-allocate space in a dequeue */
     LockedDequeQueue(size_t=0) {};
 };