ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix warning from fallthrough comment typo 

Fix "warning: this statement may fall through [-Wimplicit-fallthrough=]",
caused by the misspelling of "fallthrough" as "fallthough" in
editor_ops.cc.

Note that if you use ccache, you'll need to clear its cache to actually
get rid of the warning, because the pre-processed file (with comments
removed) is identical before & after this change, and thus won't get
recompiled otherwise.

Fix the equivalent typos in marker.cc too, though in those cases there's
no actual warning, because presently all the fall-throughs are from empty
cases.
This commit is contained in:
Colin Fletcher 2023-06-02 17:50:47 +01:00
parent 55afdc2aa4
commit 96eb7652c9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_ops.cc
View File

@ -2741,7 +2741,7 @@ Editor::cut_copy_section (ARDOUR::SectionOperation const op)
break;
case SectionSelectRetainAndMovePlayhead:
_session->request_locate (op != CutPasteSection ? to_end.samples (): to.samples ());
/* fallthough */
/* fallthrough */
case SectionSelectRetain:
if (op == CutPasteSection || to < end) {
selection->set (to, to_end);

18
gtk2_ardour/marker.cc
View File

@ -190,8 +190,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, std::s
*/
switch (_type) {
case Mark: /* fallthough */
case RegionCue: /* fallthough */
case Mark: /* fallthrough */
case RegionCue: /* fallthrough */
case BBTPosition:
points = new ArdourCanvas::Points ();
@ -206,7 +206,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, std::s
_label_offset = 8.0 * scale;
break;
case Tempo: /* fallthough */
case Tempo: /* fallthrough */
case Meter:
points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple ( M5, 0.0));
@ -220,9 +220,9 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, std::s
_label_offset = 12.0 * scale;
break;
case PunchIn: /* fallthough */
case LoopStart: /* fallthough */
case SessionStart: /* fallthough */
case PunchIn: /* fallthrough */
case LoopStart: /* fallthrough */
case SessionStart: /* fallthrough */
case RangeStart:
points = new ArdourCanvas::Points ();
points->push_back (ArdourCanvas::Duple ( 0.0, 0.0));
@ -235,9 +235,9 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, std::s
break;
case PunchOut: /* fallthough */
case LoopEnd: /* fallthough */
case SessionEnd: /* fallthough */
case PunchOut: /* fallthrough */
case LoopEnd: /* fallthrough */
case SessionEnd: /* fallthrough */
case RangeEnd:
points = new ArdourCanvas::Points (); // leaks
points->push_back (ArdourCanvas::Duple ( M6, 0.0));