diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-24 13:39:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-27 06:12:01 +0000 |
| commit | efac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5 (patch) | |
| tree | 4fdf4539e1b876d4d3d671379be040661c6e847a /include/tools | |
| parent | afbf466103fd8bb2f3c120a36c181852ad4c967f (diff) | |
remove some unused defines
Change-Id: Ib2d50e8c29ccbc5ffcb52cdff4ae3eaae9a62188
Reviewed-on: https://gerrit.libreoffice.org/17332
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/diagnose_ex.h | 20 | ||||
| -rw-r--r-- | include/tools/rtti.hxx | 7 | ||||
| -rw-r--r-- | include/tools/stream.hxx | 6 |
3 files changed, 0 insertions, 33 deletions
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h index 55cfe16a4f19..12946154d16b 100644 --- a/include/tools/diagnose_ex.h +++ b/include/tools/diagnose_ex.h @@ -125,26 +125,6 @@ return; \ } -/** asserts a given condition (in debug mode), and continues the most-inner - loop if the condition is not met -*/ -#define ENSURE_OR_CONTINUE( c, m ) \ - if ( !(c) ) \ - { \ - OSL_ENSURE( false, m ); \ - continue; \ - } - -/** asserts a given condition (in debug mode), and continues the most-inner - loop if the condition is not met -*/ -#define ENSURE_OR_BREAK( c, m ) \ - if ( !(c) ) \ - { \ - OSL_ENSURE( false, m ); \ - break; \ - } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx index 1bc9c448c3d5..9f178d2ae739 100644 --- a/include/tools/rtti.hxx +++ b/include/tools/rtti.hxx @@ -39,13 +39,6 @@ typedef void* (*TypeId)(); virtual TypeId Type() const SAL_OVERRIDE; \ virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE -#define TYPEINFO_VISIBILITY(visibility) \ - visibility static void* CreateType(); \ - visibility static TypeId StaticType(); \ - visibility static bool IsOf( TypeId aSameOrSuperType ); \ - visibility virtual TypeId Type() const; \ - visibility virtual bool IsA( TypeId aSameOrSuperType ) const - #define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \ visibility static void* CreateType(); \ visibility static TypeId StaticType(); \ diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 202e3ff5a6ff..3b9f26891ae5 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -61,12 +61,6 @@ namespace o3tl template<> struct typed_flags<StreamMode> : is_typed_flags<StreamMode, 0x0f1f> {}; } -#define STREAM_READWRITEBITS (StreamMode::READ | StreamMode::WRITE | \ - StreamMode::NOCREATE | StreamMode::TRUNC) - -#define STREAM_SHAREBITS (StreamMode::SHARE_DENYNONE | StreamMode::SHARE_DENYREAD |\ - StreamMode::SHARE_DENYWRITE | StreamMode::SHARE_DENYALL) - #define STREAM_READWRITE (StreamMode::READ | StreamMode::WRITE) #define STREAM_SHARE_DENYREADWRITE (StreamMode::SHARE_DENYREAD | StreamMode::SHARE_DENYWRITE) |