Mercurial > hg > orthanc

annotate Resources/Patches/boost-1.67.0-linux-standard-base.patch @ 2867:251614c2edac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomMoveScuJob
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 08 Oct 2018 16:08:51 +0200
parents 13038d638097
children fae500411605
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2679
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb boost_1_67_0.orig/boost/move/adl_move_swap.hpp boost_1_67_0/boost/move/adl_move_swap.hpp
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- boost_1_67_0.orig/boost/move/adl_move_swap.hpp 2018-06-20 18:00:42.559109755 +0200
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ boost_1_67_0/boost/move/adl_move_swap.hpp 2018-06-20 17:49:35.176072431 +0200
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -28,6 +28,8 @@
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 //Try to avoid including <algorithm>, as it's quite big
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB)
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +#elif defined(__LSB_VERSION__)
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +# include <utility>
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 #elif defined(BOOST_GNU_STDLIB)
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 //For non-GCC compilers, where GNUC version is not very reliable, or old GCC versions
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 //use the good old stl_algobase header, which is quite lightweight
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 diff -urEb boost_1_67_0.orig/boost/thread/detail/config.hpp boost_1_67_0/boost/thread/detail/config.hpp
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 --- boost_1_67_0.orig/boost/thread/detail/config.hpp 2018-06-20 18:00:42.555109761 +0200
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 +++ boost_1_67_0/boost/thread/detail/config.hpp 2018-06-20 18:01:08.695070530 +0200
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 @@ -417,6 +417,8 @@
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 #elif defined(BOOST_THREAD_CHRONO_MAC_API)
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 #define BOOST_THREAD_HAS_MONO_CLOCK
2781
13038d638097 primitives for android ndk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2679
diff changeset
20 +#elif defined(__LSB_VERSION__) || defined(__ANDROID__)
2679
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 + #define BOOST_THREAD_HAS_MONO_CLOCK
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #else
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include <time.h> // check for CLOCK_MONOTONIC
ee9a6cd63891 boost 1.67.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #if defined(CLOCK_MONOTONIC)