Kaydet (Commit) 51f73f35 authored tarafından Kohei Yoshida's avatar Kohei Yoshida Kaydeden (comit) Kohei Yoshida

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: 's avatarKohei Yoshida <libreoffice@kohei.us>
üst 5061663c
...@@ -166,8 +166,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a ...@@ -166,8 +166,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a
export LXML_TARBALL := lxml-4.1.1.tgz export LXML_TARBALL := lxml-4.1.1.tgz
export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
export MDDS_SHA256SUM := dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1 export MDDS_SHA256SUM := 9ac690c37f5f06dc88551405d5daf9d9ad25edf65aae6325b59e905c2ba444c3
export MDDS_TARBALL := mdds-1.3.1.tar.bz2 export MDDS_TARBALL := mdds-1.4.1.tar.bz2
export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0 export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0
export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
......
...@@ -13,13 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) ...@@ -13,13 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0)) $(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,\ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
external/mdds/c++17.patch \
external/mdds/gcc9.patch \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
--- 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)
{
--- 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>
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