Skip to content

C
core
Kaydet (Commit) 662f26a6 authored tarafından Herbert Dürr's avatar Herbert Dürr
Dosyalara gözat
Seçenekler

#i123774# the DBG_ERROR/DBG_WARN/DBG_TRACE macros should always show file and line infO

üst 912bfc38
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 24 deletions
tools/inc/tools/debug.hxx
Dosyayı görüntüle @ 662f26a6
...@@ -345,23 +345,11 @@ TOOLS_DLLPUBLIC void DbgOutTypef( sal_uInt16 nOutType, const sal_Char* pFStr, .. ...@@ -345,23 +345,11 @@ TOOLS_DLLPUBLIC void DbgOutTypef( sal_uInt16 nOutType, const sal_Char* pFStr, ..
TOOLS_DLLPUBLIC void DbgOutf( const sal_Char* pFStr, ... ); TOOLS_DLLPUBLIC void DbgOutf( const sal_Char* pFStr, ... );
TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... ); TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... );
inline void DbgTrace( const sal_Char* pMsg, #define DbgTrace( msg) do{ DbgOut( msg, DBG_OUT_TRACE, __FILE__, __LINE__ ); } while(0)
const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
{
DbgOut( pMsg, DBG_OUT_TRACE, pFile, nLine );
}
inline void DbgWarning( const sal_Char* pMsg, #define DbgWarning( msg) do{ DbgOut( msg, DBG_OUT_WARNING, __FILE__, __LINE__ ); } while(0)
const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
{
DbgOut( pMsg, DBG_OUT_WARNING, pFile, nLine );
}
inline void DbgError( const sal_Char* pMsg, #define DbgError( msg) do{ DbgOut( msg, DBG_OUT_ERROR, __FILE__, __LINE__ ); } while(0)
const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
{
DbgOut( pMsg, DBG_OUT_ERROR, pFile, nLine );
}
// --- Dbg-Test-Functions --- // --- Dbg-Test-Functions ---
...@@ -473,8 +461,7 @@ do \ ...@@ -473,8 +461,7 @@ do \
{ \ { \
if ( !( sCon ) ) \ if ( !( sCon ) ) \
{ \ { \
DbgWarning( aWarning, __FILE__, \ DbgWarning( aWarning); \
__LINE__ ); \
} \ } \
} \ } \
} while(0) } while(0)
...@@ -486,8 +473,7 @@ do \ ...@@ -486,8 +473,7 @@ do \
{ \ { \
if ( !( sCon ) ) \ if ( !( sCon ) ) \
{ \ { \
DbgError( aError, \ DbgError( aError); \
__FILE__, __LINE__ ); \
} \ } \
} \ } \
} while(0) } while(0)
...@@ -498,8 +484,7 @@ do \ ...@@ -498,8 +484,7 @@ do \
{ \ { \
if ( !( sCon ) ) \ if ( !( sCon ) ) \
{ \ { \
DbgError( aError, \ DbgError( aError); \
__FILE__, __LINE__ ); \
} \ } \
} while(0) } while(0)
#else #else
...@@ -561,7 +546,7 @@ do \ ...@@ -561,7 +546,7 @@ do \
do \ do \
{ \ { \
if ( DbgIsTraceOut() ) \ if ( DbgIsTraceOut() ) \
DbgTrace( aTrace, __FILE__, __LINE__ ); \ DbgTrace( aTrace ); \
} while(0) } while(0)
#define DBG_WARNING( aWarning ) \ #define DBG_WARNING( aWarning ) \
...@@ -619,7 +604,7 @@ do \ ...@@ -619,7 +604,7 @@ do \
do \ do \
{ \ { \
if ( DbgIsWarningOut() ) \ if ( DbgIsWarningOut() ) \
DbgWarning( aWarning, __FILE__, __LINE__ ); \ DbgWarning( aWarning ); \
} while(0) } while(0)
#define DBG_ERROR( aError ) \ #define DBG_ERROR( aError ) \
...@@ -677,7 +662,7 @@ do \ ...@@ -677,7 +662,7 @@ do \
do \ do \
{ \ { \
if ( DbgIsErrorOut() ) \ if ( DbgIsErrorOut() ) \
DbgError( aError, __FILE__, __LINE__ ); \ DbgError( aError ); \
} while(0) } while(0)
#define DBG_TESTSOLARMUTEX() \ #define DBG_TESTSOLARMUTEX() \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment