[Libreoffice-commits] core.git: cppu/source

[Noel Grandin (via logerrit)]

 cppu/source/threadpool/current.cxx |    4 ++--
 cppu/source/threadpool/current.hxx |    4 ++--
 cppu/source/uno/lbenv.cxx          |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9f46bcac09c7f1f8ef6f22ed9f366d1fd596f9d7
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Sep 10 19:31:37 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Sep 10 21:19:48 2021 +0200

    clang:optin.performance.Padding in cppu
    
    Excessive padding in 'struct cppu::IdContainer' (11 padding bytes, where
    3 is optimal).
    Excessive padding in 'struct (anonymous namespace)::ObjectEntry' (11
    padding bytes, where 3 is optimal).
    
    Change-Id: I39216b9927abeb8ec61ab590dc25bc203a112028
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121921
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index 6a992c6af541..d085cb4a5092 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -83,10 +83,10 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
 IdContainer::IdContainer()
     : pCurrentContext(nullptr)
     , pCurrentContextEnv(nullptr)
-    , bInit(false)
     , pLocalThreadId(nullptr)
-    , nRefCountOfCurrentId(0)
     , pCurrentId(nullptr)
+    , nRefCountOfCurrentId(0)
+    , bInit(false)
 {
 }
 
diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx
index cb0094413d66..1f6ce6642738 100644
--- a/cppu/source/threadpool/current.hxx
+++ b/cppu/source/threadpool/current.hxx
@@ -32,10 +32,10 @@ struct IdContainer
     void *               pCurrentContext;
     _uno_ExtEnvironment * pCurrentContextEnv;
 
-    bool                bInit;
     sal_Sequence *      pLocalThreadId;
-    sal_Int32           nRefCountOfCurrentId;
     sal_Sequence *      pCurrentId;
+    sal_Int32           nRefCountOfCurrentId;
+    bool                bInit;
 
     IdContainer();
     ~IdContainer();
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index f018cde00cfd..c9a2d89933d5 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -75,8 +75,8 @@ struct InterfaceEntry
 struct ObjectEntry
 {
     OUString oid;
-    sal_Int32 nRef;
     std::vector< InterfaceEntry > aInterfaces;
+    sal_Int32 nRef;
     bool mixedObject;
 
     explicit ObjectEntry( const OUString & rOId_ );