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>
28 lines
838 B
Diff
28 lines
838 B
Diff
diff -ru boost.orig/boost/multi_array/concept_checks.hpp boost/boost/multi_array/concept_checks.hpp
|
|
--- foo/misc/boost.orig/boost/multi_array/concept_checks.hpp 2014-04-23 17:36:51.000000000 +0200
|
|
+++ foo/misc/boost/boost/multi_array/concept_checks.hpp 2015-07-18 20:58:17.222982959 +0200
|
|
@@ -58,6 +58,13 @@
|
|
|
|
} // namespace detail
|
|
|
|
+// MSVC 2008 produces 2 warnings "default constructor could not be generated"
|
|
+// here that run over ~100 lines :(
|
|
+#ifdef _MSC_VER
|
|
+#pragma warning(push,1)
|
|
+#pragma warning(disable: 4510)
|
|
+#pragma warning(disable: 4610)
|
|
+#endif
|
|
|
|
template <typename Array, std::size_t NumDims >
|
|
struct ConstMultiArrayConcept
|
|
@@ -119,6 +126,9 @@
|
|
index_range range;
|
|
};
|
|
|
|
+#ifdef _MSC_VER
|
|
+#pragma warning(pop)
|
|
+#endif
|
|
|
|
template <typename Array, std::size_t NumDims >
|
|
struct MutableMultiArrayConcept
|