Mercurial > octave
diff libinterp/corefcn/balance.cc @ 23826:d69021d58a61
avoid fallthrough warnings
* oct-conf-post.in.h (OCTAVE_FALLTHROUGH): New macro.
* mk-octave-config-h.sh: Emit OCTAVE_FALLTROUGH definition.
* balance.cc, find.cc, gcd.cc, quad.cc, qz.cc, ov-classdef.cc,
DASPK.cc, lo-utils.cc: Use OCTAVE_FALLTHROUGH to avoid warnings.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 02 Aug 2017 17:16:19 -0400 |
| parents | 336f89b6208b |
| children | 194eb4bd202b |
line wrap: on
line diff
--- a/libinterp/corefcn/balance.cc Wed Aug 02 16:11:44 2017 -0400 +++ b/libinterp/corefcn/balance.cc Wed Aug 02 17:16:19 2017 -0400 @@ -255,18 +255,22 @@ { case 4: retval(3) = result.balanced_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 3: retval(2) = result.balanced_matrix (); retval(1) = result.balancing_matrix2 (); retval(0) = result.balancing_matrix (); break; + case 2: retval(1) = result.balancing_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 1: retval(0) = result.balancing_matrix (); break; + default: error ("balance: invalid number of output arguments"); break; @@ -280,18 +284,22 @@ { case 4: retval(3) = result.balanced_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 3: retval(2) = result.balanced_matrix (); retval(1) = result.balancing_matrix2 (); retval(0) = result.balancing_matrix (); break; + case 2: retval(1) = result.balancing_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 1: retval(0) = result.balancing_matrix (); break; + default: error ("balance: invalid number of output arguments"); break; @@ -308,18 +316,22 @@ { case 4: retval(3) = result.balanced_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 3: retval(2) = result.balanced_matrix (); retval(1) = result.balancing_matrix2 (); retval(0) = result.balancing_matrix (); break; + case 2: retval(1) = result.balancing_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 1: retval(0) = result.balancing_matrix (); break; + default: error ("balance: invalid number of output arguments"); break; @@ -333,18 +345,22 @@ { case 4: retval(3) = result.balanced_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 3: retval(2) = result.balanced_matrix (); retval(1) = result.balancing_matrix2 (); retval(0) = result.balancing_matrix (); break; + case 2: retval(1) = result.balancing_matrix2 (); - // fall through + OCTAVE_FALLTHROUGH; + case 1: retval(0) = result.balancing_matrix (); break; + default: error ("balance: invalid number of output arguments"); break;