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_ );