You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/09/09 21:50:36 UTC

svn commit: r813096 - /qpid/branches/0.5-release/qpid/cpp/src/qpid/client/Dispatcher.cpp

Author: shuston
Date: Wed Sep  9 19:50:35 2009
New Revision: 813096

URL: http://svn.apache.org/viewvc?rev=813096&view=rev
Log:
Back-port QPID-2090 fix for Boost 1.40

Modified:
    qpid/branches/0.5-release/qpid/cpp/src/qpid/client/Dispatcher.cpp

Modified: qpid/branches/0.5-release/qpid/cpp/src/qpid/client/Dispatcher.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/cpp/src/qpid/client/Dispatcher.cpp?rev=813096&r1=813095&r2=813096&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/cpp/src/qpid/client/Dispatcher.cpp (original)
+++ qpid/branches/0.5-release/qpid/cpp/src/qpid/client/Dispatcher.cpp Wed Sep  9 19:50:35 2009
@@ -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 @@
     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()) {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org