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

[Libreoffice Gerrit user]

 external/mdds/UnpackedTarball_mdds.mk |    1 
 external/mdds/gcc9.patch              |   42 ++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

New commits:
commit daa2fd4a81efaea35f18b53b65407464ba57eeaa
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 26 10:39:30 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 26 13:34:20 2018 +0200

    external/mdds: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
    
    ...by removing explicitly user-provided functions that do the same as their
    implicitly-defined counterparts, but whose presence may prevent implicitly
    declared copy functions from being defined as non-deleted in the future
    
    Change-Id: Ie9b943af57bd8081c06a531fb3c634e52f0a99b6
    Reviewed-on: https://gerrit.libreoffice.org/58048
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index 4f6db6b24e7b..9480bb8273af 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
 # unnecessary uses of obsolete std::unary_function":
 $(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/gcc9.patch b/external/mdds/gcc9.patch
new file mode 100644
index 000000000000..c7d19e99437d
--- /dev/null
+++ b/external/mdds/gcc9.patch
@@ -0,0 +1,42 @@
+--- 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>