diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-12-22 18:59:43 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-12-23 11:44:47 +0100 |
| commit | 2e0b757e62536281f61b8d37987378646a246fcb (patch) | |
| tree | 3ddd351e9080919820c17215d08834e5ec1a69cf /include/o3tl | |
| parent | tdf#138246 Disable edit rename delete contextmenu items for built-in templates (diff) | |
| download | core-2e0b757e62536281f61b8d37987378646a246fcb.tar.gz core-2e0b757e62536281f61b8d37987378646a246fcb.zip | |
Rename sorted_vector::erase(size_t) to erase_at
emscripten clang fails with:
sc/source/core/data/attarray.cxx:378:44: \
error: call to member function 'erase' is ambiguous
aNewCondFormatData.erase(nIndex);
~~~~~~~~~~~~~~~~~~~^~~~~
include/o3tl/sorted_vector.hxx:86:15: note: candidate function
size_type erase( const Value& x )
^
include/o3tl/sorted_vector.hxx:97:10: note: candidate function
void erase( size_t index )
This looks like a compiler error, but if the vector contained
size_t values, this would also be ambiguous to begin with. So
this just renames erase(size_t) to erase_at.
And instead of a 2nd find in the failing code, after copying
the vector, it mow uses std::distance to remove the item.
Change-Id: I7d03ff32352a1890cc01ca241452c0f00d6a9302
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108212
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'include/o3tl')
| -rw-r--r-- | include/o3tl/sorted_vector.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx index 508fe61cc03e..2bd8b7273a9a 100644 --- a/include/o3tl/sorted_vector.hxx +++ b/include/o3tl/sorted_vector.hxx @@ -94,7 +94,7 @@ public: return 0; } - void erase( size_t index ) + void erase_at(size_t index) { m_vector.erase(m_vector.begin() + index); } |