Mercurial > hg > orthanc
annotate Resources/Patches/boost-1.67.0-linux-standard-base.patch @ 3807:2f28c7eb2776
fix civetweb 1.12 archive
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 02 Apr 2020 18:08:08 +0200 |
parents | fae500411605 |
children |
rev | line source |
---|---|
2679 | 1 diff -urEb boost_1_67_0.orig/boost/move/adl_move_swap.hpp boost_1_67_0/boost/move/adl_move_swap.hpp |
2877
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
2 --- boost_1_67_0.orig/boost/move/adl_move_swap.hpp 2018-06-20 17:42:27.000000000 +0200 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
3 +++ boost_1_67_0/boost/move/adl_move_swap.hpp 2018-10-12 14:27:41.368076902 +0200 |
2679 | 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_67_0.orig/boost/thread/detail/config.hpp boost_1_67_0/boost/thread/detail/config.hpp | |
2877
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
14 --- boost_1_67_0.orig/boost/thread/detail/config.hpp 2018-06-20 17:42:27.000000000 +0200 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
15 +++ boost_1_67_0/boost/thread/detail/config.hpp 2018-10-12 14:27:41.372076898 +0200 |
2679 | 16 @@ -417,6 +417,8 @@ |
17 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO | |
18 #elif defined(BOOST_THREAD_CHRONO_MAC_API) | |
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 | 21 + #define BOOST_THREAD_HAS_MONO_CLOCK |
22 #else | |
23 #include <time.h> // check for CLOCK_MONOTONIC | |
24 #if defined(CLOCK_MONOTONIC) | |
2877
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
25 diff -urEb boost_1_67_0.orig/boost/type_traits/detail/has_postfix_operator.hpp boost_1_67_0/boost/type_traits/detail/has_postfix_operator.hpp |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
26 --- boost_1_67_0.orig/boost/type_traits/detail/has_postfix_operator.hpp 2018-06-20 17:42:27.000000000 +0200 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
27 +++ boost_1_67_0/boost/type_traits/detail/has_postfix_operator.hpp 2018-10-12 14:31:27.539874170 +0200 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
28 @@ -32,8 +32,11 @@ |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
29 namespace boost { |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
30 namespace detail { |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
31 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
32 +// https://stackoverflow.com/a/15474269 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
33 +#ifndef Q_MOC_RUN |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
34 // This namespace ensures that argument-dependent name lookup does not mess things up. |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
35 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
36 +#endif |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
37 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
38 // 1. a function to have an instance of type T without requiring T to be default |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
39 // constructible |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
40 @@ -181,7 +184,9 @@ |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
41 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Lhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
42 }; |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
43 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
44 +#ifndef Q_MOC_RUN |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
45 } // namespace impl |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
46 +#endif |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
47 } // namespace detail |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
48 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
49 // this is the accessible definition of the trait to end user |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
50 diff -urEb boost_1_67_0.orig/boost/type_traits/detail/has_prefix_operator.hpp boost_1_67_0/boost/type_traits/detail/has_prefix_operator.hpp |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
51 --- boost_1_67_0.orig/boost/type_traits/detail/has_prefix_operator.hpp 2018-06-20 17:42:27.000000000 +0200 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
52 +++ boost_1_67_0/boost/type_traits/detail/has_prefix_operator.hpp 2018-10-12 14:31:40.991862281 +0200 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
53 @@ -45,8 +45,11 @@ |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
54 namespace boost { |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
55 namespace detail { |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
56 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
57 +// https://stackoverflow.com/a/15474269 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
58 +#ifndef Q_MOC_RUN |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
59 // This namespace ensures that argument-dependent name lookup does not mess things up. |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
60 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
61 +#endif |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
62 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
63 // 1. a function to have an instance of type T without requiring T to be default |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
64 // constructible |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
65 @@ -194,7 +197,9 @@ |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
66 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Rhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
67 }; |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
68 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
69 +#ifndef Q_MOC_RUN |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
70 } // namespace impl |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
71 +#endif |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
72 } // namespace detail |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
73 |
fae500411605
patch for compatibility between Qt4 and boost
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2781
diff
changeset
|
74 // this is the accessible definition of the trait to end user |