Files
loongoffice/external/mdds/Wunused-but-set-variable.patch
Stephan Bergmann 13666bb9e5 external/mdds: -Werror,-Wunused-but-set-variable (Clang 13 trunk)
> In file included from svl/source/misc/gridprinter.cxx:16:
> In file included from workdir/UnpackedTarball/mdds/include/mdds/multi_type_matrix.hpp:37:
> In file included from workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector.hpp:1358:
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_def.inl:851:15: error: variable 'start_pos' set but not used [-Werror,-Wunused-but-set-variable]
>     size_type start_pos = m_cur_size;
>               ^
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_def.inl:3926:15: error: variable 'start_row_itr' set but not used [-Werror,-Wunused-but-set-variable]
>     size_type start_row_itr = start_row_in_block1;
>               ^

Change-Id: I1f5e7e1f6a2b8457eb6d65dbd65336d3684c2b89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116808
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
2021-06-09 08:39:09 +02:00

47 lines
1.6 KiB
Diff

--- include/mdds/multi_type_vector_def.inl
+++ include/mdds/multi_type_vector_def.inl
@@ -843,18 +843,12 @@
typename multi_type_vector<_CellBlockFunc, _EventFunc>::iterator
multi_type_vector<_CellBlockFunc, _EventFunc>::push_back_empty()
{
- size_type last_block_size = 0;
- if (!m_blocks.empty())
- last_block_size = m_blocks.back().m_size;
-
size_type block_index = m_blocks.size();
- size_type start_pos = m_cur_size;
if (!append_empty(1))
{
// Last empty block has been extended.
--block_index;
- start_pos -= last_block_size;
}
// Get the iterator of the last block.
@@ -3923,8 +3917,6 @@
size_type offset = start_row - start_row_in_block1;
size_type end_row_in_block2 = start_row_in_block2 + blk2->m_size - 1;
- size_type start_row_itr = start_row_in_block1;
-
// Initially set to erase blocks between block 1 and block 2 non-inclusive at either end.
typename blocks_type::iterator it_erase_begin = m_blocks.begin() + block_index1 + 1;
typename blocks_type::iterator it_erase_end = m_blocks.begin() + block_index2;
@@ -3948,7 +3940,6 @@
data_blk.mp_data = blk0->mp_data;
blk0->mp_data = nullptr;
- start_row_itr -= blk0->m_size;
data_blk.m_size += blk0->m_size;
data_blk.m_position = blk0->m_position;
@@ -3967,7 +3958,6 @@
element_block_func::resize_block(*blk1->mp_data, offset);
}
blk1->m_size = offset;
- start_row_itr += offset;
}
if (blk0_copied)