Mercurial > hg > orthanc
view Resources/Patches/boost-1.67.0-linux-standard-base.patch @ 2738:3a55b77339ff
fix deadlock in Lua scripts
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 16 Jul 2018 11:19:30 +0200 |
| parents | ee9a6cd63891 |
| children | 13038d638097 |
line wrap: on
line source
diff -urEb boost_1_67_0.orig/boost/move/adl_move_swap.hpp boost_1_67_0/boost/move/adl_move_swap.hpp --- boost_1_67_0.orig/boost/move/adl_move_swap.hpp 2018-06-20 18:00:42.559109755 +0200 +++ boost_1_67_0/boost/move/adl_move_swap.hpp 2018-06-20 17:49:35.176072431 +0200 @@ -28,6 +28,8 @@ //Try to avoid including <algorithm>, as it's quite big #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB) #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm +#elif defined(__LSB_VERSION__) +# include <utility> #elif defined(BOOST_GNU_STDLIB) //For non-GCC compilers, where GNUC version is not very reliable, or old GCC versions //use the good old stl_algobase header, which is quite lightweight diff -urEb boost_1_67_0.orig/boost/thread/detail/config.hpp boost_1_67_0/boost/thread/detail/config.hpp --- boost_1_67_0.orig/boost/thread/detail/config.hpp 2018-06-20 18:00:42.555109761 +0200 +++ boost_1_67_0/boost/thread/detail/config.hpp 2018-06-20 18:01:08.695070530 +0200 @@ -417,6 +417,8 @@ #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO #elif defined(BOOST_THREAD_CHRONO_MAC_API) #define BOOST_THREAD_HAS_MONO_CLOCK +#elif defined(__LSB_VERSION__) + #define BOOST_THREAD_HAS_MONO_CLOCK #else #include <time.h> // check for CLOCK_MONOTONIC #if defined(CLOCK_MONOTONIC)