From 14cd5182c5f64c43581c82db8c958369152226ac Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 May 2016 16:42:16 +0200 Subject: Replace fallthrough comments with new SAL_FALLTHROUGH macro ...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca --- rsc/source/parser/erscerr.cxx | 2 +- rsc/source/parser/rsclex.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'rsc') diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index edd7a4dc3f96..761dedbfaa9b 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -124,7 +124,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) case ERR_NOINPUT: StdLstErr( "Input file was not specified.\n"); - //fall-through + SAL_FALLTHROUGH; case ERR_USAGE: StdLstOut( "Copyright (C) 2000 - 2012 LibreOffice contributors.\n" ); { diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index 5edea4cee401..1db9c16caa32 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -254,7 +254,7 @@ int MakeToken( YYSTYPE * pTokenVal ) break; case INCLUDE: bLastInclude = true; - //fall-through + SAL_FALLTHROUGH; default: pTokenVal->value = aKey.yylval; } -- cgit