Mercurial > hg > orthanc
view Resources/Patches/boost-1.68.0-linux-standard-base.patch @ 3103:81b58b549845
back to using 'var' instead of 'let' since let is not supported by many old browsers. All variables declaration have been moved to the top of the function to better show that their scope is the function
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Thu, 10 Jan 2019 10:51:36 +0100 |
parents | 8341256c6941 |
children |
line wrap: on
line source
diff -urEb boost_1_68_0.orig/boost/move/adl_move_swap.hpp boost_1_68_0/boost/move/adl_move_swap.hpp --- boost_1_68_0.orig/boost/move/adl_move_swap.hpp 2018-11-13 16:08:32.214434915 +0100 +++ boost_1_68_0/boost/move/adl_move_swap.hpp 2018-11-13 16:09:03.558399048 +0100 @@ -28,6 +28,8 @@ //Try to avoid including <algorithm>, as it's quite big #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB) #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm +#elif defined(__LSB_VERSION__) +# include <utility> #elif defined(BOOST_GNU_STDLIB) //For non-GCC compilers, where GNUC version is not very reliable, or old GCC versions //use the good old stl_algobase header, which is quite lightweight diff -urEb boost_1_68_0.orig/boost/thread/detail/config.hpp boost_1_68_0/boost/thread/detail/config.hpp --- boost_1_68_0.orig/boost/thread/detail/config.hpp 2018-11-13 16:08:32.210434920 +0100 +++ boost_1_68_0/boost/thread/detail/config.hpp 2018-11-13 16:10:03.386329911 +0100 @@ -417,7 +417,7 @@ #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO #elif defined(BOOST_THREAD_CHRONO_MAC_API) #define BOOST_THREAD_HAS_MONO_CLOCK -#elif defined(__ANDROID__) +#elif defined(__LSB_VERSION__) || defined(__ANDROID__) #define BOOST_THREAD_HAS_MONO_CLOCK #if defined(__ANDROID_API__) && __ANDROID_API__ >= 21 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO 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 --- boost_1_68_0.orig/boost/type_traits/detail/has_postfix_operator.hpp 2018-11-13 16:08:32.206434924 +0100 +++ boost_1_68_0/boost/type_traits/detail/has_postfix_operator.hpp 2018-11-13 16:11:08.374253901 +0100 @@ -32,8 +32,11 @@ namespace boost { namespace detail { +// https://stackoverflow.com/a/15474269 +#ifndef Q_MOC_RUN // This namespace ensures that argument-dependent name lookup does not mess things up. namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { +#endif // 1. a function to have an instance of type T without requiring T to be default // constructible @@ -181,7 +184,9 @@ BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Lhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); }; +#ifndef Q_MOC_RUN } // namespace impl +#endif } // namespace detail // this is the accessible definition of the trait to end user 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 --- boost_1_68_0.orig/boost/type_traits/detail/has_prefix_operator.hpp 2018-11-13 16:08:32.206434924 +0100 +++ boost_1_68_0/boost/type_traits/detail/has_prefix_operator.hpp 2018-11-13 16:14:30.278012856 +0100 @@ -45,8 +45,11 @@ namespace boost { namespace detail { +// https://stackoverflow.com/a/15474269 +#ifndef Q_MOC_RUN // This namespace ensures that argument-dependent name lookup does not mess things up. namespace BOOST_JOIN(BOOST_TT_TRAIT_NAME,_impl) { +#endif // 1. a function to have an instance of type T without requiring T to be default // constructible @@ -194,7 +197,10 @@ BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Rhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); }; + +#ifndef Q_MOC_RUN } // namespace impl +#endif } // namespace detail // this is the accessible definition of the trait to end user Only in boost_1_68_0/boost/type_traits/detail: has_prefix_operator.hpp~