diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-09 08:50:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-13 18:14:11 +0200 |
| commit | cbce40e965acef51822b31d73da5fbc271fbcad0 (patch) | |
| tree | bad77c67c68055f7597b8ecf1df1b74e778873cf /unotools | |
| parent | 429280541ff1fbbbf3f0482211a659c96c3347d2 (diff) | |
Make content of OSL_ASSERT, DBG_ASSERT, etc. visiblie in non-debug builds
...to avoid lots of loplugin:staticmethods warnings. Also enables DBG_ASSERT
etc. also for --enable-debug builds in addition to --enable-dbgutil builds.
Change-Id: Ib89ecd9ab8ce7abb2c64790ace248b31f9d2b64d
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 3 | ||||
| -rw-r--r-- | unotools/source/misc/sharedunocomponent.cxx | 18 |
2 files changed, 3 insertions, 18 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 2fb514da4df4..2c145b80b507 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -253,7 +253,6 @@ bool implMakeAbsoluteURL(OUString & _rsPathOrURL) return bURL && implEnsureAbsolute(_rsPathOrURL); } -#if OSL_DEBUG_LEVEL > 0 static PathStatus dbgCheckStatusOfURL(OUString const& _sURL) { @@ -264,8 +263,6 @@ PathStatus dbgCheckStatusOfURL(OUString const& _sURL) return implCheckStatusOfURL(_sURL,aDirItem); } -#endif - static PathStatus checkStatusAndNormalizeURL(OUString & _sURL) { diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index c29dce82223c..16756c2fa3ca 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -158,11 +158,7 @@ namespace utl } } - void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject& - #ifdef DBG_UTIL - Source - #endif - , sal_Bool /*GetsOwnership*/ ) throw (CloseVetoException, RuntimeException, std::exception) + void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject& Source, sal_Bool /*GetsOwnership*/ ) throw (CloseVetoException, RuntimeException, std::exception) { // as long as we live, somebody wants to keep the object alive. So, veto the // closing @@ -170,11 +166,7 @@ namespace utl throw CloseVetoException(); } - void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& - #ifdef DBG_UTIL - Source - #endif - ) throw (RuntimeException, std::exception) + void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) { DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::notifyClosing: where did this come from?" ); @@ -184,11 +176,7 @@ namespace utl OSL_FAIL( "CloseableComponentImpl::notifyClosing: unreachable!" ); } - void SAL_CALL CloseableComponentImpl::disposing( const EventObject& - #ifdef DBG_UTIL - Source - #endif - ) throw (RuntimeException, std::exception) + void SAL_CALL CloseableComponentImpl::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) { DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::disposing: where did this come from?" ); OSL_FAIL( "CloseableComponentImpl::disposing: unreachable!" ); |