cppu/source/typelib/typelib.cxx | 25 +++++--------------------
include/typelib/typedescription.h | 2 ++
2 files changed, 7 insertions(+), 20 deletions(-)
New commits:
commit c3e9eb997f409f7fcf42659adedff43a8ade913d
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 24 16:54:24 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sun May 29 16:42:33 2022 +0200
[API CHANGE] Deprecate unused typelib_setCacheSize and make it a no-op
...and simplify the remaining code using the (now const) nCacheSize
Change-Id: I4468cf223c158a318ba56ba63f5f60121c94f42d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134879
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index fddaa16baa3a..293b4e3248c4 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -161,7 +161,7 @@ typedef std::list< CallbackEntry > CallbackSet_Impl;
typedef std::list< typelib_TypeDescription * > TypeDescriptionList_Impl;
// # of cached elements
-static sal_Int32 nCacheSize = 256;
+constexpr auto nCacheSize = 256;
namespace {
@@ -447,7 +447,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool
initTables) {
// insert into the cache
MutexGuard aGuard( rInit.maMutex );
- if( static_cast<sal_Int32>(rInit.maCache.size()) >= nCacheSize )
+ if( rInit.maCache.size() >= nCacheSize )
{
typelib_typedescription_release( rInit.maCache.front() );
rInit.maCache.pop_front();
@@ -2031,7 +2031,7 @@ extern "C" void SAL_CALL
typelib_typedescription_getByName(
// insert into the cache
MutexGuard aGuard( rInit.maMutex );
- if( static_cast<sal_Int32>(rInit.maCache.size()) >= nCacheSize )
+ if( rInit.maCache.size() >= nCacheSize )
{
typelib_typedescription_release( rInit.maCache.front() );
rInit.maCache.pop_front();
@@ -2085,7 +2085,7 @@ extern "C" void SAL_CALL
typelib_typedescriptionreference_new(
// insert into the cache
MutexGuard aGuard( rInit.maMutex );
- if( static_cast<sal_Int32>(rInit.maCache.size()) >= nCacheSize
)
+ if( rInit.maCache.size() >= nCacheSize )
{
typelib_typedescription_release( rInit.maCache.front() );
rInit.maCache.pop_front();
@@ -2288,24 +2288,9 @@ extern "C" void SAL_CALL
typelib_typedescriptionreference_assign(
}
-extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize )
+extern "C" void SAL_CALL typelib_setCacheSize( sal_Int32 )
SAL_THROW_EXTERN_C()
{
- OSL_ENSURE( nNewSize >= 0, "### illegal cache size given!" );
- if (nNewSize < 0)
- return;
-
- TypeDescriptor_Init_Impl &rInit = Init();
- MutexGuard aGuard( rInit.maMutex );
- if (nNewSize < nCacheSize)
- {
- while (static_cast<sal_Int32>(rInit.maCache.size()) != nNewSize)
- {
- typelib_typedescription_release( rInit.maCache.front() );
- rInit.maCache.pop_front();
- }
- }
- nCacheSize = nNewSize;
}
diff --git a/include/typelib/typedescription.h
b/include/typelib/typedescription.h
index 59423bfd481b..a3e200d43738 100644
--- a/include/typelib/typedescription.h
+++ b/include/typelib/typedescription.h
@@ -720,6 +720,8 @@ CPPU_DLLPUBLIC void SAL_CALL
typelib_typedescription_getByName(
/** Sets size of type description cache.
@param nNewSize new size of cache
+
+ @deprecated Do not use, it does not have any effect.
*/
CPPU_DLLPUBLIC void SAL_CALL typelib_setCacheSize(
sal_Int32 nNewSize )
