Merge pull request #59 from jdmears2/new-boost

Updates to support latest versions of boost
tomerfiliba · Aug 15, 2013 · 1e5a510 · 1e5a510
2 parents ba96a1f + 81f0416
commit 1e5a510
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/libagnos/cpp/src/protocol.cpp b/libagnos/cpp/src/protocol.cpp
@@ -20,7 +20,15 @@
 
 #include "protocol.hpp"
 #include <boost/interprocess/detail/atomic.hpp>
+#include <boost/detail/workaround.hpp>
 
+#include <boost/version.hpp>
+
+#if BOOST_WORKAROUND(BOOST_VERSION, >= 104800)
+namespace bid = boost::interprocess::ipcdetail;
+#else
+namespace bid = boost::interprocess::detail;
+#endif
 
 namespace agnos
 {
@@ -278,7 +286,7 @@ namespace agnos
 
 		int32_t ClientUtils::get_seq()
 		{
-			return boost::interprocess::detail::atomic_inc32((boost::uint32_t*)&_seq);
+			return bid::atomic_inc32((boost::uint32_t*)&_seq);
 		}
 
 		shared_ptr<PackedException> ClientUtils::load_packed_exception()

diff --git a/libagnos/cpp/src/servers.cpp b/libagnos/cpp/src/servers.cpp
@@ -107,7 +107,7 @@ namespace agnos
 
 		void LibraryModeServer::serve()
 		{
-			shared_ptr<SocketTransportFactory> factory = boost::shared_static_cast<SocketTransportFactory>(transport_factory);
+			shared_ptr<SocketTransportFactory> factory = boost::dynamic_pointer_cast<SocketTransportFactory>(transport_factory);
 			std::cout << "AGNOS" << std::endl;
 			std::cout << factory->acceptor->local_endpoint().address().to_string() << std::endl;
 			std::cout << factory->acceptor->local_endpoint().port() << std::endl;