diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-09-09 19:45:26 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-09-09 19:45:26 +0000 |
| commit | fd40457f6f471d10c3c804202d2329c93b2cb29e (patch) | |
| tree | 7067e5f99a414f56032af73d5b4689aaddbce2c9 /cpp/src | |
| parent | 8c1c5ec3309a59c9f905b30c116c4ffb258543cf (diff) | |
| download | qpid-python-fd40457f6f471d10c3c804202d2329c93b2cb29e.tar.gz | |
Adjust to new location of state_saver in Boost 1.40; fixes QPID-2090
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813092 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/client/Dispatcher.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp index 43cbf3aa4d..a715c623bf 100644 --- a/cpp/src/qpid/client/Dispatcher.cpp +++ b/cpp/src/qpid/client/Dispatcher.cpp @@ -29,7 +29,14 @@ #include "qpid/client/Message.h" #include "qpid/client/MessageImpl.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; @@ -65,7 +72,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()) { |