mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SAL_DEBUG_BACKTRACE

Browse Source 
...after 56d071c10c "rename SAL_DEBUG_TRACE to
SAL_DEBUG_BACKTRACE" (looks like this doesn't get used much...)
This commit is contained in:
Stephan Bergmann
2017-02-09 10:35:20 +01:00
parent cff6cdb2ee
commit 8458ec8c9c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/sallogareas.cxx
View File

@@ -84,7 +84,7 @@ bool SalLogAreas::VisitCallExpr( const CallExpr* call )
loc = source.getImmediateExpansionRange( loc ).first ) loc = source.getImmediateExpansionRange( loc ).first )
{ {
StringRef inMacro = Lexer::getImmediateMacroName( loc, source, compiler.getLangOpts()); StringRef inMacro = Lexer::getImmediateMacroName( loc, source, compiler.getLangOpts());
if( inMacro == "SAL_DEBUG" ) if( inMacro == "SAL_DEBUG" || inMacro == "SAL_DEBUG_BACKTRACE" )
return true; // ok return true; // ok
} }
report( DiagnosticsEngine::Warning, "missing log area", report( DiagnosticsEngine::Warning, "missing log area",

16
include/sal/log.hxx
View File

@@ -54,6 +54,14 @@ inline void SAL_CALL log(
sal_detail_log(level, area, where, stream.str().c_str()); sal_detail_log(level, area, where, stream.str().c_str());
} }
inline void SAL_CALL log_backtrace(
sal_detail_LogLevel level, char const * area, char const * where,
std::ostringstream const & stream, int maxNoStackFramesToDisplay)
{
sal_detail_log_backtrace(
level, area, where, stream.str().c_str(), maxNoStackFramesToDisplay);
}
// Special handling of the common case where the message consists of just a // Special handling of the common case where the message consists of just a
// string literal, to produce smaller call-site code: // string literal, to produce smaller call-site code:
@@ -357,12 +365,14 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
::sal_detail_log_backtrace( \ ::sal_detail_log_backtrace( \
::SAL_DETAIL_LOG_LEVEL_DEBUG, NULL, NULL, \ ::SAL_DETAIL_LOG_LEVEL_DEBUG, NULL, NULL, \
::sal::detail::unwrapStream( \ ::sal::detail::unwrapStream( \
::sal::detail::StreamStart() << stream)); \ ::sal::detail::StreamStart() << stream), \
maxNoStackFramesToDisplay); \
} else { \ } else { \
::std::ostringstream sal_detail_stream; \ ::std::ostringstream sal_detail_stream; \
sal_detail_stream << stream; \ sal_detail_stream << stream; \
::sal::detail::log( \ ::sal::detail::log_backtrace( \
::SAL_DETAIL_LOG_LEVEL_DEBUG, NULL, NULL, sal_detail_stream); \ ::SAL_DETAIL_LOG_LEVEL_DEBUG, NULL, NULL, sal_detail_stream, \
maxNoStackFramesToDisplay); \
} \ } \
} while (false) } while (false)