diff options
| author | Alan Conway <aconway@apache.org> | 2007-10-29 21:14:44 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-10-29 21:14:44 +0000 |
| commit | da6e2b9f62966ef7d0cb69f58ffe1365af98d676 (patch) | |
| tree | a46b84d820f2c26f6094f092e18a0937deb46ecf /cpp/src/tests/Cluster.h | |
| parent | 505c43651b302ecf773bff1fcf3d45f5a1aef682 (diff) | |
| download | qpid-python-da6e2b9f62966ef7d0cb69f58ffe1365af98d676.tar.gz | |
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
Diffstat (limited to 'cpp/src/tests/Cluster.h')
| -rw-r--r-- | cpp/src/tests/Cluster.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/tests/Cluster.h b/cpp/src/tests/Cluster.h index d14d7c1392..6ff5c21fdb 100644 --- a/cpp/src/tests/Cluster.h +++ b/cpp/src/tests/Cluster.h @@ -20,7 +20,7 @@ */ #include "qpid/cluster/Cluster.h" -#include "qpid/sys/ConcurrentQueue.h" +#include "qpid/sys/BlockingQueue.h" #include "qpid/framing/AMQFrame.h" #include <boost/bind.hpp> @@ -45,12 +45,10 @@ using namespace boost; void null_deleter(void*) {} template <class T> -class TestHandler : public Handler<T&>, public ConcurrentQueue<T> +class TestHandler : public Handler<T&>, public BlockingQueue<T> { public: void handle(T& frame) { push(frame); } - bool waitPop(T& x) { return waitPop(x, TIME_SEC); } - using ConcurrentQueue<T>::waitPop; }; typedef TestHandler<AMQFrame> TestFrameHandler; |