diff options
| author | Michaël Lefèvre <lefevre00@yahoo.fr> | 2014-03-31 21:32:47 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-04-05 03:47:34 -0500 |
| commit | 22ab56f5e35dff58e1923b693dc33ff252293557 (patch) | |
| tree | 8356adc53ab669db2b36227512bc82375ea15e4b | |
| parent | cddbec75d402e260d6997ad69377346a8aa5774a (diff) | |
fdo#43157 : clean up OSL_DEBUG_ONLY
Change-Id: Ic92b64cfaec41bf4104cede5f26579d86543b9a8
Reviewed-on: https://gerrit.libreoffice.org/8804
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | connectivity/source/commontools/RowFunctionParser.cxx | 4 | ||||
| -rw-r--r-- | include/osl/diagnose.h | 12 | ||||
| -rw-r--r-- | slideshow/source/engine/smilfunctionparser.cxx | 9 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 5 |
4 files changed, 13 insertions, 17 deletions
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 987a04e715aa..55184727eb56 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -467,7 +467,9 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& _sFunctio aExpressionGrammer, ::boost::spirit::space_p ) ); - OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync +#if (OSL_DEBUG_LEVEL > 0) + ::std::cout.flush(); // needed to keep stdout and cout in sync +#endif // input fully congested by the parser? if( !aParseInfo.full ) diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h index b0f7bada2f29..4137d21c6c5b 100644 --- a/include/osl/diagnose.h +++ b/include/osl/diagnose.h @@ -95,8 +95,6 @@ */ #define OSL_LOG_PREFIX SAL_DETAIL_WHERE -#define OSL_DEBUG_ONLY(s) _OSL_DEBUG_ONLY(s) - #define OSL_TRACE(...) \ SAL_DETAIL_INFO_IF_FORMAT(OSL_DEBUG_LEVEL > 0, "legacy.osl", __VA_ARGS__) @@ -122,16 +120,6 @@ #define _OSL_GLOBAL #endif /* __cplusplus */ -#if OSL_DEBUG_LEVEL > 0 - -#define _OSL_DEBUG_ONLY(f) (f) - -#else - -#define _OSL_DEBUG_ONLY(f) ((void)0) - -#endif /* OSL_DEBUG_LEVEL */ - /* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */ /* copied from boost/current_function.hpp to make it usable from C * sources as well diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 600818c1aba5..5b1922de91d0 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -564,7 +564,10 @@ namespace slideshow aEnd, aExpressionGrammer, ::boost::spirit::space_p ) ); - OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync + +#if OSL_DEBUG_LEVEL > 0 + ::std::cout.flush(); // needed to keep stdout and cout in sync +#endif // input fully congested by the parser? if( !aParseInfo.full ) @@ -610,8 +613,10 @@ namespace slideshow aEnd, aExpressionGrammer >> ::boost::spirit::end_p, ::boost::spirit::space_p ) ); - OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync +#if OSL_DEBUG_LEVEL > 0 + ::std::cout.flush(); // needed to keep stdout and cout in sync +#endif // input fully congested by the parser? if( !aParseInfo.full ) throw ParseError( "SmilFunctionParser::parseSmilFunction(): string not fully parseable" ); diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 228e1d23d1c0..00185bfa2af0 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -1183,9 +1183,10 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& rFunction aEnd, aExpressionGrammer >> ::boost::spirit::end_p, ::boost::spirit::space_p ) ); - OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync - +#if (OSL_DEBUG_LEVEL > 0) + ::std::cout.flush(); // needed to keep stdout and cout in sync +#endif // input fully congested by the parser? if( !aParseInfo.full ) |