Mercurial > hg > orthanc
annotate Resources/Patches/boost-1.68.0-linux-standard-base.patch @ 3544:bf6a61b918ef
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 17 Oct 2019 21:42:01 +0200 |
parents | 8341256c6941 |
children |
rev | line source |
---|---|
2930
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 diff -urEb boost_1_68_0.orig/boost/move/adl_move_swap.hpp boost_1_68_0/boost/move/adl_move_swap.hpp |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 --- boost_1_68_0.orig/boost/move/adl_move_swap.hpp 2018-11-13 16:08:32.214434915 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 +++ boost_1_68_0/boost/move/adl_move_swap.hpp 2018-11-13 16:09:03.558399048 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 @@ -28,6 +28,8 @@ |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 //Try to avoid including <algorithm>, as it's quite big |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB) |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 +#elif defined(__LSB_VERSION__) |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 +# include <utility> |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 #elif defined(BOOST_GNU_STDLIB) |
8341256c6941
upgrade to Boost 1.68 in static builds
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 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 //use the good old stl_algobase header, which is quite lightweight |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 diff -urEb boost_1_68_0.orig/boost/thread/detail/config.hpp boost_1_68_0/boost/thread/detail/config.hpp |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 --- boost_1_68_0.orig/boost/thread/detail/config.hpp 2018-11-13 16:08:32.210434920 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 +++ boost_1_68_0/boost/thread/detail/config.hpp 2018-11-13 16:10:03.386329911 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 @@ -417,7 +417,7 @@ |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 #elif defined(BOOST_THREAD_CHRONO_MAC_API) |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 #define BOOST_THREAD_HAS_MONO_CLOCK |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 -#elif defined(__ANDROID__) |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 +#elif defined(__LSB_VERSION__) || defined(__ANDROID__) |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 #define BOOST_THREAD_HAS_MONO_CLOCK |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 #if defined(__ANDROID_API__) && __ANDROID_API__ >= 21 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 diff -urEb boost_1_68_0.orig/boost/type_traits/detail/has_postfix_operator.hpp boost_1_68_0/boost/type_traits/detail/has_postfix_operator.hpp |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 --- boost_1_68_0.orig/boost/type_traits/detail/has_postfix_operator.hpp 2018-11-13 16:08:32.206434924 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 +++ boost_1_68_0/boost/type_traits/detail/has_postfix_operator.hpp 2018-11-13 16:11:08.374253901 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 @@ -32,8 +32,11 @@ |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 namespace boost { |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 namespace detail { |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 +// https://stackoverflow.com/a/15474269 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 +#ifndef Q_MOC_RUN |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 // This namespace ensures that argument-dependent name lookup does not mess things up. |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 +#endif |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
38 // 1. a function to have an instance of type T without requiring T to be default |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 // constructible |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 @@ -181,7 +184,9 @@ |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Lhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 }; |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
44 +#ifndef Q_MOC_RUN |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
45 } // namespace impl |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 +#endif |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
47 } // namespace detail |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
48 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 // this is the accessible definition of the trait to end user |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 diff -urEb boost_1_68_0.orig/boost/type_traits/detail/has_prefix_operator.hpp boost_1_68_0/boost/type_traits/detail/has_prefix_operator.hpp |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
51 --- boost_1_68_0.orig/boost/type_traits/detail/has_prefix_operator.hpp 2018-11-13 16:08:32.206434924 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
52 +++ boost_1_68_0/boost/type_traits/detail/has_prefix_operator.hpp 2018-11-13 16:14:30.278012856 +0100 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
53 @@ -45,8 +45,11 @@ |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
54 namespace boost { |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
55 namespace detail { |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
56 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
57 +// https://stackoverflow.com/a/15474269 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
58 +#ifndef Q_MOC_RUN |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
59 // This namespace ensures that argument-dependent name lookup does not mess things up. |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
60 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
61 +#endif |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
62 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
63 // 1. a function to have an instance of type T without requiring T to be default |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
64 // constructible |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 @@ -194,7 +197,10 @@ |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
66 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Rhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
67 }; |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
68 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
69 + |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
70 +#ifndef Q_MOC_RUN |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
71 } // namespace impl |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
72 +#endif |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
73 } // namespace detail |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
74 |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
75 // this is the accessible definition of the trait to end user |
8341256c6941
upgrade to Boost 1.68 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
76 Only in boost_1_68_0/boost/type_traits/detail: has_prefix_operator.hpp~ |