diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-14 10:49:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-14 11:06:48 +0000 |
| commit | 218cd09611583437c05c33e2aa3b2b81cb416f98 (patch) | |
| tree | 1b3b99677e6acff1f6224f9bd7441f161fcf2596 /include/tools | |
| parent | f7965b0bcd559451c471a26bf5fd6f542887d95e (diff) | |
inline some use-once macros
Change-Id: I7ebd8fe70b083a772118a1aab8cdfbf795d6f1e5
Reviewed-on: https://gerrit.libreoffice.org/23235
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/mempool.hxx | 24 | ||||
| -rw-r--r-- | include/tools/pstm.hxx | 5 |
2 files changed, 7 insertions, 22 deletions
diff --git a/include/tools/mempool.hxx b/include/tools/mempool.hxx index ef3fe6c92f5f..4ff29d2d950d 100644 --- a/include/tools/mempool.hxx +++ b/include/tools/mempool.hxx @@ -43,9 +43,6 @@ public: #define DECL_FIXEDMEMPOOL_NEW_DECL() \ static void * operator new( size_t n ) -#define DECL_FIXEDMEMPOOL_NEW_IMPL( Class ) \ -void * Class::operator new( size_t n ) - #define IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \ { \ if ( n == sizeof( Class ) ) \ @@ -54,16 +51,9 @@ void * Class::operator new( size_t n ) return ::operator new(n); \ } -#define DECL_FIXEDMEMPOOL_NEW_INLINE( Class, aPool ) \ -DECL_FIXEDMEMPOOL_NEW_DECL() \ -IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) - #define DECL_FIXEDMEMPOOL_DEL_DECL() \ static void operator delete( void * p, size_t n ) -#define DECL_FIXEDMEMPOOL_DEL_IMPL( Class ) \ -void Class::operator delete( void * p, size_t n ) - #define IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) \ { \ if ( n == sizeof( Class ) ) \ @@ -72,16 +62,14 @@ void Class::operator delete( void * p, size_t n ) ::operator delete(p); \ } -#define DECL_FIXEDMEMPOOL_DEL_INLINE( Class, aPool ) \ -DECL_FIXEDMEMPOOL_DEL_DECL() \ -IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) - #define DECL_FIXEDMEMPOOL_NEWDEL( Class ) \ private: \ static FixedMemPool aPool; \ public: \ - DECL_FIXEDMEMPOOL_NEW_INLINE( Class, aPool ) \ - DECL_FIXEDMEMPOOL_DEL_INLINE( Class, aPool ) + DECL_FIXEDMEMPOOL_NEW_DECL() \ + IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \ + DECL_FIXEDMEMPOOL_DEL_DECL() \ + IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) #define IMPL_FIXEDMEMPOOL_NEWDEL( Class ) \ FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); @@ -95,9 +83,9 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) #define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \ FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); \ - DECL_FIXEDMEMPOOL_NEW_IMPL( Class ) \ + void * Class::operator new( size_t n ) \ IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \ - DECL_FIXEDMEMPOOL_DEL_IMPL( Class ) \ + void Class::operator delete( void * p, size_t n ) \ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) #endif diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index ffbaac1c0d9f..b948f15b24e8 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -59,7 +59,7 @@ public: virtual void Load( SvPersistStream & ) override; \ virtual void Save( SvPersistStream & ) override; -#define PRV_SV_IMPL_PERSIST( Class ) \ +#define SV_IMPL_PERSIST1( Class, Super1 ) \ void * Class::CreateInstance( SvPersistBase ** ppBase )\ { \ Class * p = new Class(); \ @@ -76,9 +76,6 @@ public: return rStm; \ } -#define SV_IMPL_PERSIST1( Class, Super1 ) \ - PRV_SV_IMPL_PERSIST( Class ) - class SvPersistStream; class SvPersistBase : public SvRttiBase |