Mercurial > hg > orthanc
comparison Resources/Patches/boost-1.69.0-linux-standard-base.patch @ 3282:e8ce77f3dec1
upgrade to Boost 1.69.0
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 21 Feb 2019 16:51:06 +0100 |
parents | |
children | bf77dbfe43b2 |
comparison
equal
deleted
inserted
replaced
3281:ea54109a7312 | 3282:e8ce77f3dec1 |
---|---|
1 diff -urEb boost_1_69_0.orig/boost/move/adl_move_swap.hpp boost_1_69_0/boost/move/adl_move_swap.hpp | |
2 --- boost_1_69_0.orig/boost/move/adl_move_swap.hpp 2019-02-21 16:37:13.000000000 +0100 | |
3 +++ boost_1_69_0/boost/move/adl_move_swap.hpp 2019-02-21 16:41:20.685036310 +0100 | |
4 @@ -28,6 +28,8 @@ | |
5 //Try to avoid including <algorithm>, as it's quite big | |
6 #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB) | |
7 #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm | |
8 +#elif defined(__LSB_VERSION__) | |
9 +# include <utility> | |
10 #elif defined(BOOST_GNU_STDLIB) | |
11 //For non-GCC compilers, where GNUC version is not very reliable, or old GCC versions | |
12 //use the good old stl_algobase header, which is quite lightweight | |
13 diff -urEb boost_1_69_0.orig/boost/thread/detail/config.hpp boost_1_69_0/boost/thread/detail/config.hpp | |
14 --- boost_1_69_0.orig/boost/thread/detail/config.hpp 2019-02-21 16:37:14.000000000 +0100 | |
15 +++ boost_1_69_0/boost/thread/detail/config.hpp 2019-02-21 16:41:43.297035914 +0100 | |
16 @@ -418,7 +418,7 @@ | |
17 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO | |
18 #elif defined(BOOST_THREAD_CHRONO_MAC_API) | |
19 #define BOOST_THREAD_HAS_MONO_CLOCK | |
20 -#elif defined(__ANDROID__) | |
21 +#elif defined(__ANDROID__) || defined(__LSB_VERSION__) | |
22 #define BOOST_THREAD_HAS_MONO_CLOCK | |
23 #if defined(__ANDROID_API__) && __ANDROID_API__ >= 21 | |
24 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO | |
25 diff -urEb boost_1_69_0.orig/boost/type_traits/detail/has_postfix_operator.hpp boost_1_69_0/boost/type_traits/detail/has_postfix_operator.hpp | |
26 --- boost_1_69_0.orig/boost/type_traits/detail/has_postfix_operator.hpp 2019-02-21 16:37:14.000000000 +0100 | |
27 +++ boost_1_69_0/boost/type_traits/detail/has_postfix_operator.hpp 2019-02-21 16:43:44.569033793 +0100 | |
28 @@ -85,8 +85,11 @@ | |
29 namespace boost { | |
30 namespace detail { | |
31 | |
32 +// https://stackoverflow.com/a/15474269 | |
33 +#ifndef Q_MOC_RUN | |
34 // This namespace ensures that argument-dependent name lookup does not mess things up. | |
35 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { | |
36 +#endif | |
37 | |
38 // 1. a function to have an instance of type T without requiring T to be default | |
39 // constructible | |
40 @@ -234,7 +237,9 @@ | |
41 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Lhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); | |
42 }; | |
43 | |
44 +#ifndef Q_MOC_RUN | |
45 } // namespace impl | |
46 +#endif | |
47 } // namespace detail | |
48 | |
49 // this is the accessible definition of the trait to end user | |
50 diff -urEb boost_1_69_0.orig/boost/type_traits/detail/has_prefix_operator.hpp boost_1_69_0/boost/type_traits/detail/has_prefix_operator.hpp | |
51 --- boost_1_69_0.orig/boost/type_traits/detail/has_prefix_operator.hpp 2019-02-21 16:37:14.000000000 +0100 | |
52 +++ boost_1_69_0/boost/type_traits/detail/has_prefix_operator.hpp 2019-02-21 16:44:40.153032821 +0100 | |
53 @@ -114,8 +114,11 @@ | |
54 namespace boost { | |
55 namespace detail { | |
56 | |
57 +// https://stackoverflow.com/a/15474269 | |
58 +#ifndef Q_MOC_RUN | |
59 // This namespace ensures that argument-dependent name lookup does not mess things up. | |
60 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { | |
61 +#endif | |
62 | |
63 // 1. a function to have an instance of type T without requiring T to be default | |
64 // constructible | |
65 @@ -263,7 +266,9 @@ | |
66 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Rhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); | |
67 }; | |
68 | |
69 +#ifndef Q_MOC_RUN | |
70 } // namespace impl | |
71 +#endif | |
72 } // namespace detail | |
73 | |
74 // this is the accessible definition of the trait to end user |