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/qpid/client/Demux.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/qpid/client/Demux.h')
| -rw-r--r-- | cpp/src/qpid/client/Demux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/client/Demux.h b/cpp/src/qpid/client/Demux.h index 0f261f70ba..3c9d4a4857 100644 --- a/cpp/src/qpid/client/Demux.h +++ b/cpp/src/qpid/client/Demux.h @@ -24,7 +24,7 @@ #include <boost/shared_ptr.hpp> #include "qpid/framing/FrameSet.h" #include "qpid/sys/Mutex.h" -#include "BlockingQueue.h" +#include "qpid/sys/BlockingQueue.h" #ifndef _Demux_ #define _Demux_ @@ -44,7 +44,7 @@ class Demux { public: typedef boost::function<bool(const framing::FrameSet&)> Condition; - typedef BlockingQueue<framing::FrameSet::shared_ptr> Queue; + typedef sys::BlockingQueue<framing::FrameSet::shared_ptr> Queue; void handle(framing::FrameSet::shared_ptr); void close(); |