From fb17783db5c9a3920aad315ed34e98e5d9aabff2 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Wed, 9 Sep 2009 19:50:35 +0000 Subject: Back-port QPID-2090 fix for Boost 1.40 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@813096 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/client/Dispatcher.cpp | 11 +++++++++-- 1 file 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 +#include +#if (BOOST_VERSION >= 104000) +# include + using boost::serialization::state_saver; +#else +# include + 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 reset(running); // Reset to false on exit. + state_saver reset(running); // Reset to false on exit. running = true; try { while (!queue->isClosed()) { -- cgit v1.2.1