diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-20 11:44:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-20 12:14:45 +0100 |
| commit | 9807566e12120f75f30394a57a86e0eb917243b9 (patch) | |
| tree | 9cd272c177871e380f789c0dd827fdbe00ed98ec /tools | |
| parent | e7f09c6e5b3228ac1e0603759d51dfec745a0e6a (diff) | |
Mempool size args are unused.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/mempool.hxx | 21 | ||||
| -rw-r--r-- | tools/source/memtools/mempool.cxx | 3 | ||||
| -rw-r--r-- | tools/workben/mempooltest.cxx | 2 |
3 files changed, 10 insertions, 16 deletions
diff --git a/tools/inc/tools/mempool.hxx b/tools/inc/tools/mempool.hxx index 0d8187882416..419941bb169e 100644 --- a/tools/inc/tools/mempool.hxx +++ b/tools/inc/tools/mempool.hxx @@ -28,6 +28,9 @@ #ifndef _SVMEMPOOL_HXX #define _SVMEMPOOL_HXX +#include "sal/config.h" + +#include "sal/macros.h" #include "tools/toolsdllapi.h" #include "tools/solar.h" @@ -44,9 +47,7 @@ class TOOLS_DLLPUBLIC FixedMemPool public: FixedMemPool( char const * pTypeName, - sal_uInt16 nTypeSize, - sal_uInt16 nInitSize = 512, - sal_uInt16 nGrowSize = 256 ); + sal_uInt16 nTypeSize ); ~FixedMemPool(); void* Alloc(); @@ -100,11 +101,8 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) DECL_FIXEDMEMPOOL_NEW_INLINE( Class, aPool ) \ DECL_FIXEDMEMPOOL_DEL_INLINE( Class, aPool ) -#define IMPL_FIXEDMEMPOOL_STRING(x) IMPL_FIXEDMEMPOOL_MAKESTRING(x) -#define IMPL_FIXEDMEMPOOL_MAKESTRING(x) #x - -#define IMPL_FIXEDMEMPOOL_NEWDEL( Class, InitSize, GrowSize) \ - FixedMemPool Class::aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) ); +#define IMPL_FIXEDMEMPOOL_NEWDEL( Class ) \ + FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); #define DECL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \ private: \ @@ -113,16 +111,13 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) DECL_FIXEDMEMPOOL_NEW_DECL(); \ DECL_FIXEDMEMPOOL_DEL_DECL(); -#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class, InitSize, GrowSize) \ - FixedMemPool Class::aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) ); \ +#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \ + FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); \ DECL_FIXEDMEMPOOL_NEW_IMPL( Class ) \ IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \ DECL_FIXEDMEMPOOL_DEL_IMPL( Class ) \ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) -#define INIT_FIXEDMEMPOOL_NEWDEL_DLL( Class, aPool, InitSize, GrowSize ) \ - aPool( IMPL_FIXEDMEMPOOL_STRING( Class ), sizeof( Class ), (InitSize), (GrowSize) ) - #endif // _SVMEMPOOL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx index 091d38d357b1..3d730deeb606 100644 --- a/tools/source/memtools/mempool.cxx +++ b/tools/source/memtools/mempool.cxx @@ -39,8 +39,7 @@ |* *************************************************************************/ -FixedMemPool::FixedMemPool ( - char const * pTypeName, sal_uInt16 nTypeSize, sal_uInt16, sal_uInt16) +FixedMemPool::FixedMemPool(char const * pTypeName, sal_uInt16 nTypeSize) : m_pTypeName (pTypeName) { char name[RTL_CACHE_NAME_LENGTH + 1]; diff --git a/tools/workben/mempooltest.cxx b/tools/workben/mempooltest.cxx index e99e2175d372..c5ee73960b0f 100644 --- a/tools/workben/mempooltest.cxx +++ b/tools/workben/mempooltest.cxx @@ -8,7 +8,7 @@ struct MempoolTest DECL_FIXEDMEMPOOL_NEWDEL(MempoolTest); }; -IMPL_FIXEDMEMPOOL_NEWDEL(MempoolTest, 0, 0); +IMPL_FIXEDMEMPOOL_NEWDEL(MempoolTest); int main() { |