Mercurial > hg > orthanc

comparison Resources/Patches/boost-1.67.0-linux-standard-base.patch @ 2877:fae500411605

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch for compatibility between Qt4 and boost
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Oct 2018 14:33:03 +0200
parents 13038d638097
children
comparison
equal deleted inserted replaced
2876:ae8e72009e64 2877:fae500411605
1 diff -urEb boost_1_67_0.orig/boost/move/adl_move_swap.hpp boost_1_67_0/boost/move/adl_move_swap.hpp 1 diff -urEb boost_1_67_0.orig/boost/move/adl_move_swap.hpp boost_1_67_0/boost/move/adl_move_swap.hpp
2 --- boost_1_67_0.orig/boost/move/adl_move_swap.hpp 2018-06-20 18:00:42.559109755 +0200 2 --- boost_1_67_0.orig/boost/move/adl_move_swap.hpp 2018-06-20 17:42:27.000000000 +0200
3 +++ boost_1_67_0/boost/move/adl_move_swap.hpp 2018-06-20 17:49:35.176072431 +0200 3 +++ boost_1_67_0/boost/move/adl_move_swap.hpp 2018-10-12 14:27:41.368076902 +0200
4 @@ -28,6 +28,8 @@ 4 @@ -28,6 +28,8 @@
5 //Try to avoid including <algorithm>, as it's quite big 5 //Try to avoid including <algorithm>, as it's quite big
6 #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB) 6 #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB)
7 #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm 7 #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm
8 +#elif defined(__LSB_VERSION__) 8 +#elif defined(__LSB_VERSION__)
9 +# include <utility> 9 +# include <utility>
10 #elif defined(BOOST_GNU_STDLIB) 10 #elif defined(BOOST_GNU_STDLIB)
11 //For non-GCC compilers, where GNUC version is not very reliable, or old GCC versions 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 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 13 diff -urEb boost_1_67_0.orig/boost/thread/detail/config.hpp boost_1_67_0/boost/thread/detail/config.hpp
14 --- boost_1_67_0.orig/boost/thread/detail/config.hpp 2018-06-20 18:00:42.555109761 +0200 14 --- boost_1_67_0.orig/boost/thread/detail/config.hpp 2018-06-20 17:42:27.000000000 +0200
15 +++ boost_1_67_0/boost/thread/detail/config.hpp 2018-06-20 18:01:08.695070530 +0200 15 +++ boost_1_67_0/boost/thread/detail/config.hpp 2018-10-12 14:27:41.372076898 +0200
16 @@ -417,6 +417,8 @@ 16 @@ -417,6 +417,8 @@
17 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO 17 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO
18 #elif defined(BOOST_THREAD_CHRONO_MAC_API) 18 #elif defined(BOOST_THREAD_CHRONO_MAC_API)
19 #define BOOST_THREAD_HAS_MONO_CLOCK 19 #define BOOST_THREAD_HAS_MONO_CLOCK
20 +#elif defined(__LSB_VERSION__) || defined(__ANDROID__) 20 +#elif defined(__LSB_VERSION__) || defined(__ANDROID__)
21 + #define BOOST_THREAD_HAS_MONO_CLOCK 21 + #define BOOST_THREAD_HAS_MONO_CLOCK
22 #else 22 #else
23 #include <time.h> // check for CLOCK_MONOTONIC 23 #include <time.h> // check for CLOCK_MONOTONIC
24 #if defined(CLOCK_MONOTONIC) 24 #if defined(CLOCK_MONOTONIC)
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
26 --- boost_1_67_0.orig/boost/type_traits/detail/has_postfix_operator.hpp 2018-06-20 17:42:27.000000000 +0200
27 +++ boost_1_67_0/boost/type_traits/detail/has_postfix_operator.hpp 2018-10-12 14:31:27.539874170 +0200
28 @@ -32,8 +32,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 @@ -181,7 +184,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_67_0.orig/boost/type_traits/detail/has_prefix_operator.hpp boost_1_67_0/boost/type_traits/detail/has_prefix_operator.hpp
51 --- boost_1_67_0.orig/boost/type_traits/detail/has_prefix_operator.hpp 2018-06-20 17:42:27.000000000 +0200
52 +++ boost_1_67_0/boost/type_traits/detail/has_prefix_operator.hpp 2018-10-12 14:31:40.991862281 +0200
53 @@ -45,8 +45,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 @@ -194,7 +197,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