Kaydet (Commit) 98e9e033 authored tarafından Mike Kaganski's avatar Mike Kaganski

external: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: Ic17ffd6fc34504cf848d963e787e685ed2142080
Reviewed-on: https://gerrit.libreoffice.org/48978Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst f7d1081a
......@@ -15,8 +15,6 @@ boost_patches += boost.gcc47679.patch
#https://svn.boost.org/trac/boost/ticket/6142
boost_patches += boost.6142.warnings.patch.1
# https://svn.boost.org/trac/boost/ticket/9885
boost_patches += boost.multi_array.C4510.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9903
boost_patches += boost.utility.Wundef.warnings.patch
......
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment