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 --- configmgr/source/xcsparser.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configmgr/source/xcsparser.cxx') diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index 844a69136a34..6c1b2fea9a4a 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -160,7 +160,7 @@ bool XcsParser::startElement( state_ = STATE_TEMPLATES; return true; } - // fall through + SAL_FALLTHROUGH; case STATE_TEMPLATES_DONE: if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals("component")) @@ -190,7 +190,7 @@ bool XcsParser::startElement( } break; } - // fall through + SAL_FALLTHROUGH; case STATE_COMPONENT: assert(!elements_.empty()); switch (elements_.top().node->kind()) { -- cgit v1.2.3