diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-03 12:14:52 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-03 12:15:53 +0100 |
| commit | d390f12bcd4944ea0f8e633d1be20f8f6ae0d26d (patch) | |
| tree | 83f8cd42e9415f3b05c8f28a38d071bdab06d8f7 | |
| parent | 2ff337833879afa6e18b4f04b4876524cd1d0656 (diff) | |
Workaround for the registration breakage on SUSE.
Commit 55c3066e52ad1843549c442e8d74f886507c58f4 seems to break the SUSE boxes,
this is a workaround for that.
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 3cf9abe0934e..9bec9a1fb6e4 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -275,6 +275,9 @@ inline void TypeDescriptor_Init_Impl::callChain( //__________________________________________________________________________________________________ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) { +#ifdef DONT_LEAK_STATIC_DATA + // The cleanup from commit 55c3066e52ad1843549c442e8d74f886507c58f4 + // introduced a breakage on SUSE, Caolan will have a look if( pCache ) { TypeDescriptionList_Impl::const_iterator aIt = pCache->begin(); @@ -355,6 +358,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) delete pCallbacks; pCallbacks = 0; +#endif if( pMutex ) { delete pMutex; |