diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-10 16:42:16 +0200 |
| commit | 14cd5182c5f64c43581c82db8c958369152226ac (patch) | |
| tree | 57f150ba2707f29214eeb9b1eaad2373780d1b15 /basegfx | |
| parent | e4bb2b4f4875c15bd68297b5be716edd6859841e (diff) | |
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
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/source/polygon/b2dlinegeometry.cxx | 2 | ||||
| -rw-r--r-- | basegfx/source/polygon/b2dsvgpolypolygon.cxx | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 9d055206b913..2177ff45fb5f 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -757,7 +757,7 @@ namespace basegfx } else { - // wanted fall-through to default + SAL_FALLTHROUGH; // wanted fall-through to default } } default: // B2DLineJoin::Bevel diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index e472e97b6c61..4e1a4b41be73 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -109,8 +109,7 @@ namespace basegfx o_rPolyPolygon.append(aCurrPoly); aCurrPoly.clear(); } - - // FALLTHROUGH intended to add coordinate data as 1st point of new polygon + SAL_FALLTHROUGH; // to add coordinate data as 1st point of new polygon } case 'l' : case 'L' : @@ -150,7 +149,7 @@ namespace basegfx case 'h' : { bRelative = true; - // FALLTHROUGH intended + SAL_FALLTHROUGH; } case 'H' : { @@ -180,7 +179,7 @@ namespace basegfx case 'v' : { bRelative = true; - // FALLTHROUGH intended + SAL_FALLTHROUGH; } case 'V' : { @@ -210,7 +209,7 @@ namespace basegfx case 's' : { bRelative = true; - // FALLTHROUGH intended + SAL_FALLTHROUGH; } case 'S' : { @@ -269,7 +268,7 @@ namespace basegfx case 'c' : { bRelative = true; - // FALLTHROUGH intended + SAL_FALLTHROUGH; } case 'C' : { @@ -319,7 +318,7 @@ namespace basegfx case 'q' : { bRelative = true; - // FALLTHROUGH intended + SAL_FALLTHROUGH; } case 'Q' : { @@ -370,7 +369,7 @@ namespace basegfx case 't' : { bRelative = true; - // FALLTHROUGH intended + SAL_FALLTHROUGH; } case 'T' : { @@ -444,7 +443,7 @@ namespace basegfx case 'a' : { bRelative = true; - // FALLTHROUGH intended + SAL_FALLTHROUGH; } case 'A' : { |