diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-25 17:01:03 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-05-11 09:41:15 +0200 |
| commit | 5eb7a3f26a36f9d53bcebc3fb6131232a709914f (patch) | |
| tree | 1a0c904ebb22854dced0fc785e2743055bbb8afe | |
| parent | 261b4dc45b359e07d4d3785aca55d75d78035551 (diff) | |
external/mdds: -Werror,-Wdeprecated-copy
> In file included from sc/source/core/data/cellvalues.cxx:12:
> In file included from sc/inc/column.hxx:28:
> In file included from sc/inc/mtvelements.hxx:30:
> In file included from workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector.hpp:33:
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:74:9: error: definition of implicit copy assignment operator for 'private_data' is deprecated because it has a user-declared copy constructor [-Werror,-Wdeprecated-copy]
> private_data(const private_data& other) :
> ^
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:44:8: note: in implicit copy assignment operator for 'mdds::detail::mtv::iterator_value_node<unsigned long, mdds::mtv::base_element_block>::private_data' first required here
> struct iterator_value_node
> ^
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:219:20: note: in implicit copy assignment operator for 'mdds::detail::mtv::iterator_value_node<unsigned long, mdds::mtv::base_element_block>' first required here
> m_cur_node = other.m_cur_node;
> ^
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:238:7: note: in instantiation of member function 'mdds::detail::mtv::iterator_common_base<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52, svl::SharedString>, mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell> >, sc::CellStoreEvent>::iterator_trait>::operator=' requested here
> class iterator_base : public iterator_common_base<_Trait>
> ^
with recent Clang 10 trunk, similar to
<https://gerrit.libreoffice.org/#/c/83698/> "Remove some redundantly
user-declared copy ctors and assignment ops"
Change-Id: I156674bad367ca68404c3c75d61ec72b401c6305
Reviewed-on: https://gerrit.libreoffice.org/83700
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93695
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | external/mdds/UnpackedTarball_mdds.mk | 1 | ||||
| -rw-r--r-- | external/mdds/Wdeprecated-copy.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk index c015f4c13f5a..c5ca78bd368c 100644 --- a/external/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -14,6 +14,7 @@ $(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/Wdeprecated-copy.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mdds/Wdeprecated-copy.patch b/external/mdds/Wdeprecated-copy.patch new file mode 100644 index 000000000000..edcb2ddaa9ec --- /dev/null +++ b/external/mdds/Wdeprecated-copy.patch @@ -0,0 +1,11 @@ +--- include/mdds/multi_type_vector_itr.hpp ++++ include/mdds/multi_type_vector_itr.hpp +@@ -71,8 +71,6 @@ + private_data() : block_index(0) {} + private_data(size_type _block_index) : + block_index(_block_index) {} +- private_data(const private_data& other) : +- block_index(other.block_index) {} + + void swap(private_data& other) + { |