premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

attempt to make separate compilation of boost.asio work on windows, mac and linux without pulling in a dependency on boost.date_time. This is a hack until boost.asio has an option to disable use of boost.date_time

This commit is contained in:
Arvid Norberg 2012-07-04 16:05:31 +00:00
parent dd858050a3
commit 796b1b98c3
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/asio.cpp
View File

@ -5,7 +5,16 @@
#define BOOST_ASIO_SOURCE #define BOOST_ASIO_SOURCE
#endif #endif
#if BOOST_VERSION >= 104500 #ifdef _MSC_VER
// on windows; including timer_queue.hpp results in an
// actual link-time dependency on boost.date_time, even
// though it's never referenced. So, avoid that on windows.
// on Mac OS X and Linux, not including it results in
// missing symbols. For some reason, this current setup
// works, at least across windows, Linux and Mac OS X.
// In the future this hack can be fixed by disabling
// use of boost.date_time in boost.asio
#include <boost/asio/detail/config.hpp> #include <boost/asio/detail/config.hpp>
@ -63,7 +72,12 @@
#include <boost/asio/detail/impl/win_object_handle_service.ipp> #include <boost/asio/detail/impl/win_object_handle_service.ipp>
#endif #endif
#else // _MSC_VER
#if BOOST_VERSION >= 104500
#include <boost/asio/impl/src.hpp>
#elif BOOST_VERSION >= 104400 #elif BOOST_VERSION >= 104400
#include <boost/asio/impl/src.cpp> #include <boost/asio/impl/src.cpp>
#endif #endif
#endif