Mercurial > hg > orthanc
annotate Resources/Patches/boost-1.69.0-linux-standard-base.patch @ 3297:bf77dbfe43b2
trying a patch for postgresql
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 22 Feb 2019 15:07:30 +0100 |
parents | e8ce77f3dec1 |
children | fa8481daefd7 |
rev | line source |
---|---|
3282
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 diff -urEb boost_1_69_0.orig/boost/move/adl_move_swap.hpp boost_1_69_0/boost/move/adl_move_swap.hpp |
3297
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
2 --- boost_1_69_0.orig/boost/move/adl_move_swap.hpp 2019-02-22 15:05:32.682359994 +0100 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
3 +++ boost_1_69_0/boost/move/adl_move_swap.hpp 2019-02-22 15:05:48.426358034 +0100 |
3282
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 @@ -28,6 +28,8 @@ |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 //Try to avoid including <algorithm>, as it's quite big |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB) |
e8ce77f3dec1
upgrade to Boost 1.69.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 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 +#elif defined(__LSB_VERSION__) |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 +# include <utility> |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 #elif defined(BOOST_GNU_STDLIB) |
e8ce77f3dec1
upgrade to Boost 1.69.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 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 //use the good old stl_algobase header, which is quite lightweight |
3297
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
13 diff -urEb boost_1_69_0.orig/boost/system/detail/system_category_win32.hpp boost_1_69_0/boost/system/detail/system_category_win32.hpp |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
14 --- boost_1_69_0.orig/boost/system/detail/system_category_win32.hpp 2019-02-22 15:05:32.722359989 +0100 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
15 +++ boost_1_69_0/boost/system/detail/system_category_win32.hpp 2019-02-22 15:06:31.922352713 +0100 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
16 @@ -26,7 +26,7 @@ |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
17 namespace detail |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
18 { |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
19 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
20 -#if ( defined(_MSC_VER) && _MSC_VER < 1900 ) || ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) ) |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
21 +#if ( defined(_MSC_VER) && _MSC_VER < 1900 ) || ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) ) || 1 /* std::snprintf() does not seem to exist on Visual Studio 2015 */ |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
22 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
23 inline char const * unknown_message_win32( int ev, char * buffer, std::size_t len ) |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
24 { |
3282
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 diff -urEb boost_1_69_0.orig/boost/thread/detail/config.hpp boost_1_69_0/boost/thread/detail/config.hpp |
3297
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
26 --- boost_1_69_0.orig/boost/thread/detail/config.hpp 2019-02-22 15:05:32.598360004 +0100 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
27 +++ boost_1_69_0/boost/thread/detail/config.hpp 2019-02-22 15:05:48.426358034 +0100 |
3282
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 @@ -418,7 +418,7 @@ |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 #elif defined(BOOST_THREAD_CHRONO_MAC_API) |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 #define BOOST_THREAD_HAS_MONO_CLOCK |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 -#elif defined(__ANDROID__) |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 +#elif defined(__ANDROID__) || defined(__LSB_VERSION__) |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 #define BOOST_THREAD_HAS_MONO_CLOCK |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 #if defined(__ANDROID_API__) && __ANDROID_API__ >= 21 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 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 |
3297
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
38 --- boost_1_69_0.orig/boost/type_traits/detail/has_postfix_operator.hpp 2019-02-22 15:05:32.650359998 +0100 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
39 +++ boost_1_69_0/boost/type_traits/detail/has_postfix_operator.hpp 2019-02-22 15:05:48.426358034 +0100 |
3282
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 @@ -85,8 +85,11 @@ |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 namespace boost { |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 namespace detail { |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
44 +// https://stackoverflow.com/a/15474269 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
45 +#ifndef Q_MOC_RUN |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 // This namespace ensures that argument-dependent name lookup does not mess things up. |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
47 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
48 +#endif |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
49 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
50 // 1. a function to have an instance of type T without requiring T to be default |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
51 // constructible |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
52 @@ -234,7 +237,9 @@ |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
53 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Lhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
54 }; |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
55 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
56 +#ifndef Q_MOC_RUN |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
57 } // namespace impl |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
58 +#endif |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
59 } // namespace detail |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
60 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
61 // this is the accessible definition of the trait to end user |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
62 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 |
3297
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
63 --- boost_1_69_0.orig/boost/type_traits/detail/has_prefix_operator.hpp 2019-02-22 15:05:32.650359998 +0100 |
bf77dbfe43b2
trying a patch for postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3282
diff
changeset
|
64 +++ boost_1_69_0/boost/type_traits/detail/has_prefix_operator.hpp 2019-02-22 15:05:48.426358034 +0100 |
3282
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 @@ -114,8 +114,11 @@ |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
66 namespace boost { |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
67 namespace detail { |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
68 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
69 +// https://stackoverflow.com/a/15474269 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
70 +#ifndef Q_MOC_RUN |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
71 // This namespace ensures that argument-dependent name lookup does not mess things up. |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
72 namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
73 +#endif |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
74 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
75 // 1. a function to have an instance of type T without requiring T to be default |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
76 // constructible |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
77 @@ -263,7 +266,9 @@ |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
78 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Rhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
79 }; |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
80 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
81 +#ifndef Q_MOC_RUN |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
82 } // namespace impl |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
83 +#endif |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
84 } // namespace detail |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
85 |
e8ce77f3dec1
upgrade to Boost 1.69.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
86 // this is the accessible definition of the trait to end user |