Update mdds to 2.0.1.

Change-Id: I7d5e5432d75caf671434977b48b415839cbf90b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126795
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>

4 files changed, 2 insertions, 139 deletions

diff --git a/download.lst b/download.lst
index 1a70e6a44ba0..0e93fecf0e9d 100644
--- a/download.lst
+++ b/download.lst
@@ -178,8 +178,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a
 export LXML_TARBALL := lxml-4.1.1.tgz
 export MARIADB_CONNECTOR_C_SHA256SUM := 431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
 export MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
-export MDDS_SHA256SUM := 5a0fb2dd88a6420e0a69ec4c7259bcd1fe8f4a80b232c150e11f3da4c68236d7
-export MDDS_TARBALL := mdds-2.0.0.tar.bz2
+export MDDS_SHA256SUM := 3ab33fce58e6acf9540cc1a52264be6863ef80f55ac287194cc98cda48e71fe6
+export MDDS_TARBALL := mdds-2.0.1.tar.bz2
 export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index cf5bd48a1eb6..c015f4c13f5a 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
-	external/mdds/remove-unused-parameters.patch.1 \
-	external/mdds/remove-more-unused-parameters.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mdds/remove-more-unused-parameters.patch.1 b/external/mdds/remove-more-unused-parameters.patch.1
deleted file mode 100644
index c0c29471c9ed..000000000000
--- a/external/mdds/remove-more-unused-parameters.patch.1
+++ /dev/null
@@ -1,42 +0,0 @@
-From cc24c84d35274aead5afe574c87ecd6368aa5e2a Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Tue, 2 Nov 2021 18:24:30 -0400
-Subject: [PATCH] More unused parameters.
-
-I personally cannot reproduce the warnings. But The android x86 build
-of LibreOffice generates the following build warnings:
-
-In file included from /home/tdf/lode/jenkins/workspace/android_x86/svl/source/misc/gridprinter.cxx:16:
-In file included from /home/tdf/lode/jenkins/workspace/android_x86/workdir/UnpackedTarball/mdds/include/mdds/multi_type_matrix.hpp:37:
-In file included from /home/tdf/lode/jenkins/workspace/android_x86/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector.hpp:31:
-In file included from /home/tdf/lode/jenkins/workspace/android_x86/workdir/UnpackedTarball/mdds/include/mdds/./multi_type_vector/soa/main.hpp:35:
-/home/tdf/lode/jenkins/workspace/android_x86/workdir/UnpackedTarball/mdds/include/mdds/./multi_type_vector/soa/./block_util.hpp:49:27: error: unused parameter 'block_store' [-Werror,-Wunused-parameter]
-    void operator()(Blks& block_store, int64_t start_block_index, int64_t delta) const
-                          ^
-/home/tdf/lode/jenkins/workspace/android_x86/workdir/UnpackedTarball/mdds/include/mdds/./multi_type_vector/soa/./block_util.hpp:49:48: error: unused parameter 'start_block_index' [-Werror,-Wunused-parameter]
-    void operator()(Blks& block_store, int64_t start_block_index, int64_t delta) const
-                                               ^
-/home/tdf/lode/jenkins/workspace/android_x86/workdir/UnpackedTarball/mdds/include/mdds/./multi_type_vector/soa/./block_util.hpp:49:75: error: unused parameter 'delta' [-Werror,-Wunused-parameter]
-    void operator()(Blks& block_store, int64_t start_block_index, int64_t delta) const
-                                                                          ^
-3 errors generated.
----
- include/mdds/multi_type_vector/soa/block_util.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/mdds/multi_type_vector/soa/block_util.hpp b/include/mdds/multi_type_vector/soa/block_util.hpp
-index d10ee67..73ba27c 100644
---- a/include/mdds/multi_type_vector/soa/block_util.hpp
-+++ b/include/mdds/multi_type_vector/soa/block_util.hpp
-@@ -46,7 +46,7 @@ namespace detail {
- template<typename Blks, lu_factor_t F>
- struct adjust_block_positions
- {
--    void operator()(Blks& block_store, int64_t start_block_index, int64_t delta) const
-+    void operator()(Blks& /*block_store*/, int64_t /*start_block_index*/, int64_t /*delta*/) const
-     {
-         static_assert(invalid_static_int<F>, "The loop-unrolling factor must be one of 0, 4, 8, 16, or 32.");
-     }
--- 
-2.25.1
-
diff --git a/external/mdds/remove-unused-parameters.patch.1 b/external/mdds/remove-unused-parameters.patch.1
deleted file mode 100644
index ebfc94fbf107..000000000000
--- a/external/mdds/remove-unused-parameters.patch.1
+++ /dev/null
@@ -1,93 +0,0 @@
-From 695e4c73fb55b1002237b0a22f13162c5c91aa68 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Mon, 1 Nov 2021 14:54:36 -0400
-Subject: [PATCH] Remove unused parameter warnings in public headers.
-
----
- include/mdds/multi_type_vector/util.hpp | 10 ++++++++--
- include/mdds/trie_map_def.inl           | 12 ++++++------
- 2 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/include/mdds/multi_type_vector/util.hpp b/include/mdds/multi_type_vector/util.hpp
-index d21e302..a1cb1f9 100644
---- a/include/mdds/multi_type_vector/util.hpp
-+++ b/include/mdds/multi_type_vector/util.hpp
-@@ -51,7 +51,10 @@ struct empty_event_func
-      *
-      * @param block pointer to the acquired element block instance.
-      */
--    void element_block_acquired(const base_element_block* block) {}
-+    void element_block_acquired(const base_element_block* block)
-+    {
-+        (void)block;
-+    }
- 
-     /**
-      * Callback function for element block release events.  This gets called
-@@ -61,7 +64,10 @@ struct empty_event_func
-      *
-      * @param block pointer to the element block instance being released.
-      */
--    void element_block_released(const base_element_block* block) {}
-+    void element_block_released(const base_element_block* block)
-+    {
-+        (void)block;
-+    }
- };
- 
- /**
-diff --git a/include/mdds/trie_map_def.inl b/include/mdds/trie_map_def.inl
-index 49e6de0..be18aec 100644
---- a/include/mdds/trie_map_def.inl
-+++ b/include/mdds/trie_map_def.inl
-@@ -1004,7 +1004,7 @@ packed_trie_map<_KeyTrait,_ValueT>::packed_trie_map(const packed_trie_map& other
-     {
-         packed_trie_map& m_parent;
- 
--        void node(const uintptr_t* node_pos, key_unit_type c, size_t depth, size_t index_size)
-+        void node(const uintptr_t* node_pos, key_unit_type /*c*/, size_t /*depth*/, size_t /*index_size*/)
-         {
-             uintptr_t value_ptr = *node_pos;
- 
-@@ -1315,13 +1315,13 @@ void packed_trie_map<_KeyTrait,_ValueT>::save_state(std::ostream& os) const
-         }
- 
-         /** first element in the buffer. */
--        void root_offset(size_t i, const uintptr_t& v) const
-+        void root_offset(size_t /*i*/, const uintptr_t& v) const
-         {
-             write(v);
-         }
- 
-         /** first element in each node section. */
--        void node_value(size_t i, const uintptr_t& v) const
-+        void node_value(size_t /*i*/, const uintptr_t& v) const
-         {
-             const value_type* p = reinterpret_cast<const value_type*>(v);
-             if (p)
-@@ -1348,19 +1348,19 @@ void packed_trie_map<_KeyTrait,_ValueT>::save_state(std::ostream& os) const
-          * second element in each node section that stores the size of
-          * the child data sub-section.
-          */
--        void node_index_size(size_t i, const uintptr_t& v) const
-+        void node_index_size(size_t /*i*/, const uintptr_t& v) const
-         {
-             write(v);
-         }
- 
-         /** element that stores the key value for child node. */
--        void node_child_key(size_t i, const uintptr_t& v) const
-+        void node_child_key(size_t /*i*/, const uintptr_t& v) const
-         {
-             write(v);
-         }
- 
-         /** element that stores the relative offset of the child node. */
--        void node_child_offset(size_t i, const uintptr_t& v) const
-+        void node_child_offset(size_t /*i*/, const uintptr_t& v) const
-         {
-             write(v);
-         }
--- 
-2.25.1
-