forked from amazingfate/loongoffice
5f321b5011
1.59 upcoming release is needed for MSVC 14.0 (aka VS 2015) support. There is a known breakage on MSVC with boost::none instance in optional library. Use not documented define as explained in this issue upstream [1]: BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE. [1] https://svn.boost.org/trac/boost/ticket/11203 Change-Id: I25b1797da93f7959d15a70105d67100e0e2c4b3b Reviewed-on: https://gerrit.libreoffice.org/17056 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
22 lines
867 B
Diff
22 lines
867 B
Diff
diff -ru boost.orig/boost/config/compiler/clang.hpp boost/boost/config/compiler/clang.hpp
|
|
--- foo/misc/boost.orig/boost/config/compiler/clang.hpp 2015-05-07 19:11:52.000000000 +0200
|
|
+++ foo/misc/boost/boost/config/compiler/clang.hpp 2015-07-18 22:40:56.304941957 +0200
|
|
@@ -10,6 +10,8 @@
|
|
|
|
#define BOOST_HAS_PRAGMA_ONCE
|
|
|
|
+#include <utility>
|
|
+
|
|
// Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined when that flag is used.
|
|
#if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
|
|
# define BOOST_HAS_PRAGMA_DETECT_MISMATCH
|
|
@@ -161,7 +163,7 @@
|
|
# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
|
|
#endif
|
|
|
|
-#if !__has_feature(cxx_rvalue_references)
|
|
+#if !__has_feature(cxx_rvalue_references) || (defined(__APPLE__) && !defined(_LIBCPP_VERSION))
|
|
# define BOOST_NO_CXX11_RVALUE_REFERENCES
|
|
#endif
|
|
|