[Libreoffice-commits] core.git: external/boost

[Mike Kaganski]

 external/boost/UnpackedTarball_boost.mk               |    2 -
 external/boost/boost.multi_array.C4510.warnings.patch |   27 ------------------
 2 files changed, 29 deletions(-)

New commits:
commit 98e9e033527d5f50df1fbf2918358c6f529d63ad
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 12:49:06 2018 +0300

    external: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: Ic17ffd6fc34504cf848d963e787e685ed2142080
    Reviewed-on: https://gerrit.libreoffice.org/48978
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 21136ed2aec0..2e6688c59b18 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -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 --git a/external/boost/boost.multi_array.C4510.warnings.patch b/external/boost/boost.multi_array.C4510.warnings.patch
deleted file mode 100644
index d450ace6bfd7..000000000000
--- a/external/boost/boost.multi_array.C4510.warnings.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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