diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-08 21:49:45 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-08 23:51:41 +0300 |
| commit | 6aa069882831720fcff5217b0b0705e42dee72cc (patch) | |
| tree | 493c58ff421b5b070b886c90949799f68d7aedf3 /framework/inc | |
| parent | c5ab14cbaf02ec42e587475d0f77b2b13f7c6068 (diff) | |
Use SAL_INFO instead of framework's own LOG_WARNING
Change-Id: Ief44fceaf03d2567f4aacd9ff74d361436e5e05b
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/macros/debug.hxx | 5 | ||||
| -rw-r--r-- | framework/inc/macros/debug/assertion.hxx | 39 |
2 files changed, 3 insertions, 41 deletions
diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx index c56dcf952b7f..de3d07a60931 100644 --- a/framework/inc/macros/debug.hxx +++ b/framework/inc/macros/debug.hxx @@ -41,12 +41,10 @@ #ifndef ENABLE_ASSERTIONS #define ENABLE_ASSERTIONS #endif - #ifndef ENABLE_WARNINGS - #define ENABLE_WARNINGS - #endif //----------------------------------------------------------------------------------------------------------------- // => "non product" +// NOTE #elif OSL_DEBUG_LEVEL > 0 // Enable log mechanism for normal assertion and error handling. @@ -67,7 +65,6 @@ #undef ENABLE_LOGMECHANISM #undef ENABLE_ASSERTIONS - #undef ENABLE_WARNINGS #undef ENABLE_EVENTDEBUG #undef ENABLE_REGISTRATIONDEBUG // #undef ENABLE_TIMEMEASURE diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx index a1a620e2a8c6..75cafcc2fe78 100644 --- a/framework/inc/macros/debug/assertion.hxx +++ b/framework/inc/macros/debug/assertion.hxx @@ -20,7 +20,7 @@ #ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_ #define __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_ -#if defined( ENABLE_ASSERTIONS ) || defined( ENABLE_WARNINGS ) +#if defined( ENABLE_ASSERTIONS ) #include <osl/diagnose.h> #include <rtl/strbuf.hxx> @@ -31,17 +31,15 @@ // special macros for assertion handling // 1) LOGTYPE use it to define the output of all assertions, errors, exception infos // 2) LOGFILE_ASSERTIONS use it to define the file name to log assertions if LOGTYPE=LOGTYPE_FILE... -// 3) LOGFILE_WARNINGS use it to define the file name to log warnings if LOGTYPE=LOGTYPE_FILE... // active for "non product": // 4) LOG_ASSERT( BCONDITION, STEXT ) assert some critical errors which depend from given condition // 4a) LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) same like 4) + additional location of error // 5) LOG_ERROR( SMETHOD, STEXT ) show errors without any condition // active for debug only! -// 7) LOG_WARNING( SMETHOD, STEXT ) should be used to detect leaks in algorithm, mechanism or operation handling //***************************************************************************************************************** //_________________________________________________________________________________________________________________ -#if defined( ENABLE_ASSERTIONS ) || defined( ENABLE_WARNINGS ) +#if defined( ENABLE_ASSERTIONS ) /*_____________________________________________________________________________________________________________ LOGFILE_ASSERTIONS @@ -160,39 +158,6 @@ #endif // ENABLE_ASSERTIONS -//_________________________________________________________________________________________________________________ -#if defined( ENABLE_WARNINGS ) - - /*_____________________________________________________________________________________________________________ - LOGFILE_WARNINGS - - For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! - _____________________________________________________________________________________________________________*/ - - #ifndef LOGFILE_WARNINGS - #define LOGFILE_WARNINGS "_framework_warnings.log" - #endif - - /*_____________________________________________________________________________________________________________ - LOG_WARNING( SMETHOD, STEXT ) - - Use it to show/log warnings for programmer for follow reasons: - - algorithm errors - - undefined states - - unknown errors from other modules ... - _____________________________________________________________________________________________________________*/ - - #define LOG_WARNING( SMETHOD, STEXT ) \ - LOG_ERROR( SMETHOD, STEXT ) - -#else - - // If right testmode is'nt set - implements these macros empty! - #undef LOGFILE_WARNINGS - #define LOG_WARNING( SMETHOD, STEXT ) - -#endif // ENABLE_WARNINGS - #endif // #ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |