1diff -urEb boost_1_68_0.orig/boost/move/adl_move_swap.hpp boost_1_68_0/boost/move/adl_move_swap.hpp 2--- boost_1_68_0.orig/boost/move/adl_move_swap.hpp 2018-11-13 16:08:32.214434915 +0100 3+++ boost_1_68_0/boost/move/adl_move_swap.hpp 2018-11-13 16:09:03.558399048 +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 13diff -urEb boost_1_68_0.orig/boost/thread/detail/config.hpp boost_1_68_0/boost/thread/detail/config.hpp 14--- boost_1_68_0.orig/boost/thread/detail/config.hpp 2018-11-13 16:08:32.210434920 +0100 15+++ boost_1_68_0/boost/thread/detail/config.hpp 2018-11-13 16:10:03.386329911 +0100 16@@ -417,7 +417,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(__LSB_VERSION__) || defined(__ANDROID__) 22 #define BOOST_THREAD_HAS_MONO_CLOCK 23 #if defined(__ANDROID_API__) && __ANDROID_API__ >= 21 24 #define BOOST_THREAD_INTERNAL_CLOCK_IS_MONO 25diff -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 26--- boost_1_68_0.orig/boost/type_traits/detail/has_postfix_operator.hpp 2018-11-13 16:08:32.206434924 +0100 27+++ boost_1_68_0/boost/type_traits/detail/has_postfix_operator.hpp 2018-11-13 16:11:08.374253901 +0100 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 50diff -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 51--- boost_1_68_0.orig/boost/type_traits/detail/has_prefix_operator.hpp 2018-11-13 16:08:32.206434924 +0100 52+++ boost_1_68_0/boost/type_traits/detail/has_prefix_operator.hpp 2018-11-13 16:14:30.278012856 +0100 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,10 @@ 66 BOOST_STATIC_CONSTANT(bool, value = (trait_impl1 < Rhs_noref, Ret, BOOST_TT_FORBIDDEN_IF >::value)); 67 }; 68 69+ 70+#ifndef Q_MOC_RUN 71 } // namespace impl 72+#endif 73 } // namespace detail 74 75 // this is the accessible definition of the trait to end user 76Only in boost_1_68_0/boost/type_traits/detail: has_prefix_operator.hpp~ 77