diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-09-09 19:50:35 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-09-09 19:50:35 +0000 |
| commit | fb17783db5c9a3920aad315ed34e98e5d9aabff2 (patch) | |
| tree | 454e7cff45a1d291a089fba7b1dd0cb941e132cb | |
| parent | 8ecb8e5db18f0dc5ada1fce78587abf52b093c6c (diff) | |
| download | qpid-python-0.5-release.tar.gz | |
Back-port QPID-2090 fix for Boost 1.400.5-release
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@813096 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/client/Dispatcher.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/client/Dispatcher.cpp b/qpid/cpp/src/qpid/client/Dispatcher.cpp index 8d8574520a..ebe76c810b 100644 --- a/qpid/cpp/src/qpid/client/Dispatcher.cpp +++ b/qpid/cpp/src/qpid/client/Dispatcher.cpp @@ -27,7 +27,14 @@ #include "qpid/sys/BlockingQueue.h" #include "Message.h" -#include <boost/state_saver.hpp> +#include <boost/version.hpp> +#if (BOOST_VERSION >= 104000) +# include <boost/serialization/state_saver.hpp> + using boost::serialization::state_saver; +#else +# include <boost/state_saver.hpp> + using boost::state_saver; +#endif /* BOOST_VERSION */ using qpid::framing::FrameSet; using qpid::framing::MessageTransferBody; @@ -64,7 +71,7 @@ void Dispatcher::run() Mutex::ScopedLock l(lock); if (running) throw Exception("Dispatcher is already running."); - boost::state_saver<bool> reset(running); // Reset to false on exit. + state_saver<bool> reset(running); // Reset to false on exit. running = true; try { while (!queue->isClosed()) { |