diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
commit | 932fb7b958f8e7204275cb709965b30e390c76ad (patch) | |
tree | 75f695663a97693416f8a84e140fa61805cf5bd2 /tools/source/memtools | |
parent | bb54b94e5f48c4f6dce72f59dc6bc83f17d2c590 (diff) | |
parent | 78f80b020fe009bc48e9e5f8b7862de51f1f8381 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/source/win32/dtobj/XTDataObject.cxx
dtrans/source/win32/dtobj/XTDataObject.hxx
sot/source/sdstor/stgio.cxx
tools/source/debug/debug.cxx
vcl/source/gdi/jobset.cxx
vcl/unx/kde4/KDEData.cxx
vcl/unx/kde4/KDEData.hxx
vcl/unx/kde4/KDESalDisplay.cxx
vcl/unx/kde4/KDESalFrame.cxx
vcl/unx/kde4/KDESalFrame.hxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/kde4/KDESalGraphics.hxx
vcl/unx/kde4/KDESalInstance.cxx
vcl/unx/kde4/KDESalInstance.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/VCLKDEApplication.hxx
Diffstat (limited to 'tools/source/memtools')
-rwxr-xr-x | tools/source/memtools/mempool.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx index 006c5de7b6e0..55856d90bc0f 100755 --- a/tools/source/memtools/mempool.cxx +++ b/tools/source/memtools/mempool.cxx @@ -29,7 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" -#include <tools/mempool.hxx> +#include "tools/mempool.hxx" +#include "osl/diagnose.h" #include "rtl/alloc.h" #include <stdio.h> @@ -41,11 +42,13 @@ *************************************************************************/ FixedMemPool::FixedMemPool ( - sal_uInt16 _nTypeSize, sal_uInt16, sal_uInt16) + char const * pTypeName, sal_uInt16 nTypeSize, sal_uInt16, sal_uInt16) + : m_pTypeName (pTypeName) { char name[RTL_CACHE_NAME_LENGTH + 1]; - snprintf (name, sizeof(name), "FixedMemPool_%d", (int)_nTypeSize); - m_pImpl = (FixedMemPool_Impl*)rtl_cache_create (name, _nTypeSize, 0, NULL, NULL, NULL, 0, NULL, 0); + snprintf (name, sizeof(name), "FixedMemPool_%d", (int)nTypeSize); + m_pImpl = (FixedMemPool_Impl*)rtl_cache_create (name, nTypeSize, 0, NULL, NULL, NULL, 0, NULL, 0); + OSL_TRACE("FixedMemPool::ctor(\"%s\"): %p", m_pTypeName, m_pImpl); } /************************************************************************* @@ -56,7 +59,8 @@ FixedMemPool::FixedMemPool ( FixedMemPool::~FixedMemPool() { - rtl_cache_destroy ((rtl_cache_type*)(m_pImpl)); + OSL_TRACE("FixedMemPool::dtor(\"%s\"): %p", m_pTypeName, m_pImpl); + rtl_cache_destroy ((rtl_cache_type*)(m_pImpl)), m_pImpl = 0; } /************************************************************************* |