summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-11-08 21:08:09 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-11-09 09:17:34 +0100
commitf381c353b4b24f185c6517593e78671b33d64baa (patch)
treeb7121cbe2481e766b1c43b070603f4e7bee51bb0 /cppu
parentd55b2631342bc7babf3709f2f83e0e502ebe4014 (diff)
BaseList doesn't need set member after the constructor is done
Change-Id: Idc174a0cd53c45beba3100b1f8258e6839291be8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124885 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/typelib/typelib.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 650ac27c3ad9..8ae7ca64865e 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -867,11 +867,11 @@ private:
typedef std::set< OUString > Set;
void calculate(
+ Set& allSet,
sal_Int32 directBaseIndex, Set & directBaseSet,
sal_Int32 * directBaseMembers,
typelib_InterfaceTypeDescription const * desc);
- Set set;
List list;
sal_Int32 members;
};
@@ -879,24 +879,26 @@ private:
BaseList::BaseList(typelib_InterfaceTypeDescription const * desc)
: members(0)
{
+ Set allSet;
for (sal_Int32 i = 0; i < desc->nBaseTypes; ++i) {
Set directBaseSet;
sal_Int32 directBaseMembers = 0;
- calculate(i, directBaseSet, &directBaseMembers, desc->ppBaseTypes[i]);
+ calculate(allSet, i, directBaseSet, &directBaseMembers, desc->ppBaseTypes[i]);
}
}
void BaseList::calculate(
+ Set& allSet,
sal_Int32 directBaseIndex, Set & directBaseSet,
sal_Int32 * directBaseMembers,
typelib_InterfaceTypeDescription const * desc)
{
for (sal_Int32 i = 0; i < desc->nBaseTypes; ++i) {
- calculate(
+ calculate(allSet,
directBaseIndex, directBaseSet, directBaseMembers,
desc->ppBaseTypes[i]);
}
- if (set.insert(desc->aBase.pTypeName).second) {
+ if (allSet.insert(desc->aBase.pTypeName).second) {
Entry e;
e.memberOffset = members;
e.directBaseIndex = directBaseIndex;