From 51f73f35ea61dd81dd3194af50394b98ff1bf8e9 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Fri, 24 Aug 2018 07:25:06 -0400
Subject: Update mdds to 1.4.1.

The largest change in 1.4.x relevant to the calc code is that the
multi_type_matrix::walk() methods now take a copy of the function
object rather than a reference, to allow for it to take an inline
lambda function.  Instead, it does return a instance of the input
function object, similar to how std::for_each() behaves.

In case the function object contains a large data member, try to
make it a moveable so that it will get moved rather than copied
when going through one of the walk() methods.

Change-Id: Ifd08fc4a2ed75039e5292a35ff08726e0126c77f
Reviewed-on: https://gerrit.libreoffice.org/59584
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
---
 external/mdds/UnpackedTarball_mdds.mk |  6 -----
 external/mdds/c++17.patch             | 22 ------------------
 external/mdds/gcc9.patch              | 42 -----------------------------------
 3 files changed, 70 deletions(-)
 delete mode 100644 external/mdds/c++17.patch
 delete mode 100644 external/mdds/gcc9.patch

(limited to 'external/mdds')

diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index 69285d758c7c..c015f4c13f5a 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -13,13 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
 
-# c++17.patch upstreamed as <https://gitlab.com/mdds/mdds/merge_requests/11> "Remove some
-#  unnecessary uses of obsolete std::unary_function";
-# gcc9.patch upstreamed at <https://gitlab.com/mdds/mdds/merge_requests/14> "Remove unnecessary
-#  user-provided special members that cause -Wdeprecated-copy":
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
-    external/mdds/c++17.patch \
-    external/mdds/gcc9.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mdds/c++17.patch b/external/mdds/c++17.patch
deleted file mode 100644
index d96910f34e68..000000000000
--- a/external/mdds/c++17.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/mdds/multi_type_matrix.hpp
-+++ include/mdds/multi_type_matrix.hpp
-@@ -149,7 +149,7 @@
- 
- private:
-     template<typename _Func>
--    struct walk_func : std::unary_function<typename store_type::const_iterator::value_type, void>
-+    struct walk_func
-     {
-         _Func& m_func;
-         walk_func(_Func& func) : m_func(func) {}
---- include/mdds/multi_type_vector.hpp
-+++ include/mdds/multi_type_vector.hpp
-@@ -139,7 +139,7 @@
-         block& operator=(block);
-     };
- 
--    struct element_block_deleter : public std::unary_function<void, const element_block_type*>
-+    struct element_block_deleter
-     {
-         void operator() (const element_block_type* p)
-         {
diff --git a/external/mdds/gcc9.patch b/external/mdds/gcc9.patch
deleted file mode 100644
index c7d19e99437d..000000000000
--- a/external/mdds/gcc9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- include/mdds/multi_type_vector_itr.hpp
-+++ include/mdds/multi_type_vector_itr.hpp
-@@ -54,9 +54,6 @@
-     iterator_value_node(size_type start_pos, size_type block_index) :
-         type(mdds::mtv::element_type_empty), position(start_pos), size(0), data(nullptr), __private_data(block_index) {}
- 
--    iterator_value_node(const iterator_value_node& other) :
--        type(other.type), position(other.position), size(other.size), data(other.data), __private_data(other.__private_data) {}
--
-     void swap(iterator_value_node& other)
-     {
-         std::swap(type, other.type);
-@@ -272,9 +269,6 @@
-         size_type start_pos, size_type block_index) :
-         common_base(pos, end, start_pos, block_index) {}
- 
--    iterator_base(const iterator_base& other) :
--        common_base(other) {}
--
-     value_type& operator*()
-     {
-         return m_cur_node;
-@@ -345,9 +339,6 @@
-         size_type start_pos, size_type block_index) :
-         common_base(pos, end, start_pos, block_index) {}
- 
--    const_iterator_base(const const_iterator_base& other) :
--        common_base(other) {}
--
-     /**
-      * Take the non-const iterator counterpart to create a const iterator.
-      */
---- include/mdds/multi_type_vector_types.hpp
-+++ include/mdds/multi_type_vector_types.hpp
-@@ -90,7 +90,6 @@
- protected:
-     element_t type;
-     base_element_block(element_t _t) : type(_t) {}
--    ~base_element_block() {}
- };
- 
- template<typename _Self, element_t _TypeId, typename _Data>
-- 
cgit