add abort() to non-reached code

This cleans up a lot of false-positives in static analysis
and also helps compilers to optimize code paths in general.
(tagging the fatal stingstream operator as ‘noreturn’ is
far less trivial)

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 94e4369aae3432cd97f979a015541eafd23bdddc..57fd46be7303d5d31340999265f673cfd03fe428 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -346,7 +346,7 @@ AddRouteDialog::mode ()
        } else {
                fatal << string_compose (X_("programming error: unknown track mode in add route dialog combo = %1"), str)
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
        /* keep gcc happy */
        return ARDOUR::Normal;

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 68757c256b1b1cc3169d0ccba5a7743c674b9ad5..df1820eeeb6147dac48025ace07a4972099013bc 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -113,7 +113,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
                break;
        default:
                fatal << string_compose (_("programming error: %1"), "illegal track mode in ::create_region_view()") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
 
        }
 

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ba4eb09cd1dbac4dcfa17eb2d71173ba4d233386..d5c9aa6fea239561d6667e4e83a8734fdbf9e35c 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2631,7 +2631,7 @@ Editor::timecode_snap_to_internal (framepos_t& start, int32_t direction, bool /*
                break;
        default:
                fatal << "Editor::smpte_snap_to_internal() called with non-timecode snap type!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 }
 

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index d16105987a192922340ab81b643f6fc81e698bbb..e8125ef59346fee8b484a47f7fa5553e42c624f5 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -1081,7 +1081,7 @@ Editor::snap_type_action (SnapType type)
                break;
        default:
                fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible snap-to type", (int) type) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        act = ActionManager::get_action (X_("Snap"), action);
@@ -1477,7 +1477,7 @@ Editor::snap_mode_action (SnapMode mode)
                break;
        default:
                fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible snap mode type", (int) mode) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        act = ActionManager::get_action (X_("Editor"), action);
@@ -1541,7 +1541,7 @@ Editor::edit_point_action (EditPoint ep)
                break;
        default:
                fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible edit point type", (int) ep) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        act = ActionManager::get_action (X_("Editor"), action);
@@ -1599,7 +1599,7 @@ Editor::zoom_focus_action (ZoomFocus focus)
                break;
        default:
                fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible focus type", (int) focus) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        act = ActionManager::get_action (X_("Zoom"), action);

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index e5ac8c6c725231b2666186f1742e9020e7d6d0aa..af1d41f91fe156f8ae028c93a1de3f6eed14866d 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -314,14 +314,14 @@ Editor::do_import (vector<string> paths, ImportDisposition disposition, ImportMo
                                continue;
                        case 0:
                                fatal << "Updating existing sources should be disabled!" << endmsg;
-                               /* NOTREACHED*/
+                               abort(); /* NOTREACHED*/
                                break;
                        case 1:
                                replace = false;
                                break;
                        default:
                                fatal << "Illegal return " << check <<  " from check_whether_and_how_to_import()!" << endmsg;
-                               /* NOTREACHED*/
+                               abort(); /* NOTREACHED*/
                        }
 
                        /* have to reset this for every file we handle */

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index e40030d671d5a7fe6a0b7b65df792a7dba6b0511..f92cf07150075711c67c2f8e30f723d272f0a4d9 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -90,7 +90,7 @@ Editor::export_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 0900c7fc18b08e02b499e60d1ab59b58dc43a277..6d07ecc35716f4e9f87f0ac7354ca68c2602ac34 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -704,7 +704,7 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 
        if ((marker = static_cast<Marker*> (item.get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (entered_marker == marker) {
@@ -791,7 +791,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
        Marker * marker;
        if ((marker = reinterpret_cast<Marker *> (item->get_data("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        bool is_start;
@@ -976,7 +976,7 @@ Editor::marker_menu_hide ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -994,7 +994,7 @@ Editor::marker_menu_select_using_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1012,7 +1012,7 @@ Editor::marker_menu_select_all_selectables_using_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1031,7 +1031,7 @@ Editor::marker_menu_separate_regions_using_location ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1050,7 +1050,7 @@ Editor::marker_menu_play_from ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1080,7 +1080,7 @@ Editor::marker_menu_set_playhead ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1111,7 +1111,7 @@ Editor::marker_menu_range_to_next ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1141,7 +1141,7 @@ Editor::marker_menu_set_from_playhead ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1169,7 +1169,7 @@ Editor::marker_menu_set_from_selection (bool /*force_regions*/)
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1200,7 +1200,7 @@ Editor::marker_menu_play_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1225,7 +1225,7 @@ Editor::marker_menu_loop_range ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* l;
@@ -1276,7 +1276,7 @@ Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) c
        Marker* marker = reinterpret_cast<Marker*> (p);
        if (!marker) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        *m = dynamic_cast<MeterMarker*> (marker);
@@ -1320,7 +1320,7 @@ Editor::toggle_marker_menu_lock ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* loc;
@@ -1346,7 +1346,7 @@ Editor::marker_menu_rename ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
 
@@ -1540,7 +1540,7 @@ Editor::toggle_marker_menu_glue ()
 
        if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* loc;

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 52486a1322ac8aa46ae80be77659537317268276..3ad9f0a54c50e58b23ff5520ab5aea7a83535e92 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1332,12 +1332,12 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        
                        if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                        }
                        
                        if ((tempo_marker = dynamic_cast<TempoMarker*> (marker)) == 0) {
                                fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg;
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                        }
                        
                        edit_tempo_marker (*tempo_marker);
@@ -1350,12 +1350,12 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        
                        if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                        }
                        
                        if ((meter_marker = dynamic_cast<MeterMarker*> (marker)) == 0) {
                                fatal << _("programming error: marker for meter is not a meter marker!") << endmsg;
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                        }
                        edit_meter_marker (*meter_marker);
                        break;
@@ -1999,7 +1999,7 @@ Editor::can_remove_control_point (ArdourCanvas::Item* item)
 
        if ((control_point = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"))) == 0) {
                fatal << _("programming error: control point canvas item has no control point object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        AutomationLine& line = control_point->line ();
@@ -2024,7 +2024,7 @@ Editor::remove_control_point (ArdourCanvas::Item* item)
 
        if ((control_point = reinterpret_cast<ControlPoint *> (item->get_data ("control_point"))) == 0) {
                fatal << _("programming error: control point canvas item has no control point object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        control_point->line().remove_point (*control_point);
@@ -2037,7 +2037,7 @@ Editor::edit_control_point (ArdourCanvas::Item* item)
 
        if (p == 0) {
                fatal << _("programming error: control point canvas item has no control point object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        ControlPointDialog d (p);
@@ -2242,7 +2242,7 @@ Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/)
 
        if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        Location* location = find_location_from_marker (marker, is_start);

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 6dbbb4073f297a0708a50e1ae67bb6420893633c..b8e13bc196160506a231b78e7b38da572f3cd3ec 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -646,7 +646,7 @@ Editor::build_region_boundary_cache ()
                break;
        default:
                fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), _snap_type) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return;
        }
 

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 886d5e1209362de5e9495991e84f2a6b08bf5615..78c45c7d8d0bc3180f8bbf5563aef8f0c02b0f5c 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -1560,7 +1560,7 @@ EditorRegions::sort_type_action (Editing::RegionListSortType t) const
                break;
        default:
                fatal << string_compose (_("programming error: %1: %2"), "EditorRegions: impossible sort type", (int) t) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        RefPtr<Action> act = ActionManager::get_action (X_("RegionList"), action);

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index fec380ee358c5f56e1220e2a1250bfc6ad4904ff..daf36d2d72e145cb0dac18ee2b8f7c11c17b12bb 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -271,12 +271,12 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item)
 
        if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if ((tempo_marker = dynamic_cast<TempoMarker*> (marker)) == 0) {
                fatal << _("programming error: marker for tempo is not a tempo marker!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (tempo_marker->tempo().movable()) {
@@ -375,12 +375,12 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item)
 
        if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if ((meter_marker = dynamic_cast<MeterMarker*> (marker)) == 0) {
                fatal << _("programming error: marker for meter is not a meter marker!") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (meter_marker->meter().movable()) {

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index daba2e77d4d27316eccaae20559e645de887d380..7b7ad33f9ae5beda0146e2c1ebfac152b49a050b 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -610,7 +610,7 @@ next_meter_point (MeterPoint mp)
                break;
        }
 
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return MeterInput;
 }
 

diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc
index 703e7dd4ab4f4ded6020613ff374fcfdf419855b..d21a055d9e88875c1d68b871ce9545238f622a55 100644 (file)
--- a/gtk2_ardour/latency_gui.cc
+++ b/gtk2_ardour/latency_gui.cc
@@ -148,7 +148,7 @@ LatencyGUI::change_latency_from_button (int dir)
        } else {
                fatal << string_compose (_("programming error: %1 (%2)"), X_("illegal string in latency GUI units combo"), unitstr)
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (dir > 0) {

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index bf9da544e6b36fe4c4ecb5f37098ea6f157fc5ab..b3b5a91ed34a9b404a6adeffc3cf7f86f7230f6a 100644 (file)
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -1139,7 +1139,7 @@ PortMatrix::get_association (PortMatrixNode node) const
 
        }
 
-       /* NOTREACHED */
+       abort(); /* NOTREACHED */
        return PortMatrixNode::NOT_ASSOCIATED;
 }
 

diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index ec5ebc93a1117d74419e556b506fbac559ab7a83..f1593310183595e34c5658e0787749cb8e970f6d 100644 (file)
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -273,7 +273,7 @@ RhythmFerret::get_note_onset_function ()
        fatal << string_compose (_("programming error: %1 (%2)"), X_("illegal note onset function string"), txt)
              << endmsg;
 
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return -1;
 }
 

diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index 3addc1c5981fa0c07a04b99d20eea8405ec59cc2..e7e48f777ecaedc4431c09d0efa22b154b3caa9e 100644 (file)
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -207,7 +207,7 @@ RouteGroupDialog::do_run ()
                msg.run ();
        }
 
-       /* NOTREACHED */
+       abort(); /* NOTREACHED */
        return false;
 }
 

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 31c2eb171229879b7a02dc681e20efd56026bdfb..c4d49e40b94bbf9aae215e6d1de96f515e342f6b 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -2015,7 +2015,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
                      << string_compose (X_("processor automation curve for %1:%2/%3/%4 not registered with track!"),
                                          processor->name(), what.type(), (int) what.channel(), what.id() )
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return;
        }
 
@@ -2481,7 +2481,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
        if (find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) {
                if (find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) {
                        fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
 
                _underlay_streams.push_back(v);
@@ -2518,7 +2518,7 @@ RouteTimeAxisView::remove_underlay (StreamView* v)
 
                if (gm == other._underlay_mirrors.end()) {
                        fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
 
                v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::remove_ghost));

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 507245eb3d6a10a7e93a99e4bf2c6c013232330a..1bdc0fe8b0ae24521a2897437d484d7eb6450109 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -1002,7 +1002,7 @@ Selection::toggle (list<Selectable*> const & selectables)
                        fatal << _("programming error: ")
                              << X_("unknown selectable type passed to Selection::toggle()")
                              << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
        }
 
@@ -1056,7 +1056,7 @@ Selection::add (list<Selectable*> const & selectables)
                        fatal << _("programming error: ")
                              << X_("unknown selectable type passed to Selection::add()")
                              << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
        }
 

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index da29eb75a84a17cca6bb1f193d678a8f4c98a483..80ee165a84c4c35a0ab88360a8aac34a674d183d 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -113,7 +113,7 @@ importmode2string (ImportMode mode)
        case ImportAsTapeTrack:
                return _("as new tape tracks");
        }
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return _("as new tracks");
 }
 
@@ -1891,7 +1891,7 @@ SoundFileOmega::get_channel_disposition () const
 
        if (x == disposition_map.end()) {
                fatal << string_compose (_("programming error: %1 (%2)"), "unknown string for import disposition", str) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        return x->second;

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index ed759f3a7edc6109ee2728cd0521b4ba74574c62..73e150549f04faf47fb7aa2949139b880eb13b24 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -431,7 +431,7 @@ StreamView::update_rec_box ()
 
                default:
                        fatal << string_compose (_("programming error: %1"), "illegal track mode") << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                        return;
                }
 
@@ -575,7 +575,7 @@ StreamView::child_height () const
                return height / (_layers * 2 + 1);
        }
        
-       /* NOTREACHED */
+       abort(); /* NOTREACHED */
        return height;
 }
 

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index af8699c0011d6f7818a3c3bdba68705244419b24..58969a97f5c5f90bd94a718a60abe79c324199da 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1312,7 +1312,7 @@ TimeAxisView::preset_height (Height h)
                return button_height + extra_height;
        }
 
-       /* NOTREACHED */
+       abort(); /* NOTREACHED */
        return 0;
 }
 

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index a0f33e8c99fd0db7aabe36275e8d3799a46e03f7..8545a345eb3950fe2520d1f80e68b1a7195c32b9 100644 (file)
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -38,7 +38,7 @@ TimeSelection::operator[] (uint32_t which)
                }
        }
        fatal << string_compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return *(new AudioRange(0,0,0)); /* keep the compiler happy; never called */
 }
 

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 171fc631d551e0ea2bbce012ca86de2498693c8b..0f61656033dd05bd593e86e7628e74b86328a053 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -708,7 +708,7 @@ ARDOUR_UI_UTILS::get_icon_path (const char* cname, string icon_set, bool is_imag
        
                if (!find_file (def, name, data_file_path)) {
                        fatal << string_compose (_("cannot find icon image for %1 using %2"), name, spath.to_string()) << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
        }
 

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 7444a54a7c7822c4d834c4421d3128f7ada26051..165afd0dd9b2f72fc39f51db37f3ebf0a5be92c4 100644 (file)
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -267,8 +267,7 @@ namespace ARDOUR {
                                return seconds != 0;
                        }
 
-                       /* NOTREACHED */
-                       assert (false);
+                       abort(); /* NOTREACHED */
                        return false;
                }
        };

diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc
index 5e8dc09d452a1c5a02d58e837438465fa0555111..5f71d6246f0323642122d1a09f6f35353fb1f78c 100644 (file)
--- a/libs/ardour/audio_playlist_source.cc
+++ b/libs/ardour/audio_playlist_source.cc
@@ -169,7 +169,7 @@ framecnt_t
 AudioPlaylistSource::write_unlocked (Sample *, framecnt_t)
 {
        fatal << string_compose (_("programming error: %1"), "AudioPlaylistSource::write() called - should be impossible") << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return 0;
 }
 

diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc
index 834a98d347d4d2a1d3deaebc655f816dec6fee6c..7e50807c6e14501ca4d91317f3c2c51471e8e5d6 100644 (file)
--- a/libs/ardour/bundle.cc
+++ b/libs/ardour/bundle.cc
@@ -591,7 +591,7 @@ Bundle::type_channel_to_overall (DataType t, uint32_t c) const
                ++o;
        }
 
-       /* NOTREACHED */
+       abort(); /* NOTREACHED */
        return -1;
 }
 

diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 327665441ea0c127ddaa02d44753b9b0a90da520..9bc232007b7134d989ea00241385df3c593c753a 100644 (file)
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -202,7 +202,7 @@ Butler::dequeue_request (Request::Type& r)
                return false;
        } else {
                fatal << _("Error reading from butler request pipe") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 #else
        r = (Request::Type) m_request_state.get();
@@ -242,7 +242,7 @@ Butler::thread_work ()
 
                                        case Request::Quit:
                                                return 0;
-                                               /*NOTREACHED*/
+                                               abort(); /*NOTREACHED*/
                                                break;
 
                                        default:

diff --git a/libs/ardour/cycle_timer.cc b/libs/ardour/cycle_timer.cc
index bb4f3181e040feb25f0234549a52cb7d9695cf70..84dafd00cc30a6b0498772fb4cd3c98acf446aad 100644 (file)
--- a/libs/ardour/cycle_timer.cc
+++ b/libs/ardour/cycle_timer.cc
@@ -38,7 +38,7 @@ get_mhz()
 
        if ((f = fopen("/proc/cpuinfo", "r")) == 0) {
                fatal << _("CycleTimer::get_mhz(): can't open /proc/cpuinfo") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return 0.0f;
        }
 
@@ -50,7 +50,7 @@ get_mhz()
 
                if (fgets (buf, sizeof(buf), f) == 0) {
                        fatal << _("CycleTimer::get_mhz(): cannot locate cpu MHz in /proc/cpuinfo") << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                        return 0.0f;
                }
 
@@ -73,7 +73,7 @@ get_mhz()
        }
 
        fatal << _("cannot locate cpu MHz in /proc/cpuinfo") << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return 0.0f;
 }
 

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 30f7ef63fa2761245543d347d1f7a45ee57eedac..f7d679d3ba92a229ced3d2a4264f95d9ca432f25 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -148,7 +148,7 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out)
                        }
                } else {
                        fatal << "programming error: this should never be reached" << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
 
 
@@ -169,7 +169,7 @@ Delivery::can_support_io_configuration (const ChanCount& in, ChanCount& out)
                        }
                } else {
                        fatal << "programming error: this should never be reached" << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
 
        } else {
@@ -210,7 +210,7 @@ Delivery::configure_io (ChanCount in, ChanCount out)
                        if (_input->n_ports() != in) {
                                if (_input->n_ports() != ChanCount::ZERO) {
                                        fatal << _name << " programming error: configure_io called with " << in << " and " << out << " with " << _input->n_ports() << " input ports" << endmsg;
-                                       /*NOTREACHED*/
+                                       abort(); /*NOTREACHED*/
                                } else {
                                        /* I/O not yet configured */
                                }

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index ef9544589dcda716a02ff261b2b62a708236c3c8..259a04bc0ffa261191e663e7649ed34cf442c157 100644 (file)
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -195,11 +195,11 @@ MidiModel::NoteDiffCommand::change (const NotePtr note, Property prop,
 
        case StartTime:
                fatal << "MidiModel::DiffCommand::change() with integer argument called for start time" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                break;
        case Length:
                fatal << "MidiModel::DiffCommand::change() with integer argument called for length" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                break;
        }
 
@@ -627,7 +627,7 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
                change.property = (Property) string_2_enum (prop->value(), change.property);
        } else {
                fatal << "!!!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if ((prop = xml_change->property ("id")) == 0) {
@@ -648,7 +648,7 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
                }
        } else {
                fatal << "!!!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if ((prop = xml_change->property ("new")) != 0) {
@@ -662,7 +662,7 @@ MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
                }
        } else {
                fatal << "!!!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        /* we must point at the instance of the note that is actually in the model.
@@ -899,7 +899,7 @@ MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
                change.property = (Property) string_2_enum (prop->value(), change.property);
        } else {
                fatal << "!!!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if ((prop = xml_change->property ("id")) == 0) {
@@ -914,7 +914,7 @@ MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
                old_str >> change.old_time;
        } else {
                fatal << "!!!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if ((prop = xml_change->property ("new")) != 0) {
@@ -922,7 +922,7 @@ MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
                new_str >> change.new_time;
        } else {
                fatal << "!!!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        /* we must point at the instance of the sysex that is actually in the model.
@@ -1728,7 +1728,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
                                return -1; /* do not add the new note */
                                break;
                        default:
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                                /* stupid gcc */
                                break;
                        }
@@ -1764,7 +1764,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
                                note_length = min (note_length, (*i)->end_time() - note->time());
                                break;
                        default:
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                                /* stupid gcc */
                                break;
                        }
@@ -1783,7 +1783,7 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
                                /* cannot add in this case */
                                return -1;
                        default:
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                                /* stupid gcc */
                                break;
                        }
@@ -1801,14 +1801,14 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
                                to_be_deleted.insert (*i);
                                break;
                        default:
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                                /* stupid gcc */
                                break;
                        }
                        break;
 
                default:
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                        /* stupid gcc */
                        break;
                }

diff --git a/libs/ardour/midi_playlist_source.cc b/libs/ardour/midi_playlist_source.cc
index 68e0a478dff7c95f98a1052b08002a8c396136df..cd5362c3dafb822d166519e19f935e6120f97ca1 100644 (file)
--- a/libs/ardour/midi_playlist_source.cc
+++ b/libs/ardour/midi_playlist_source.cc
@@ -142,7 +142,7 @@ MidiPlaylistSource::write_unlocked (MidiRingBuffer<framepos_t>&,
                                     framecnt_t)
 {
        fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::write_unlocked() called - should be impossible") << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return 0;
 }
 
@@ -150,14 +150,14 @@ void
 MidiPlaylistSource::append_event_unlocked_beats(const Evoral::Event<Evoral::MusicalTime>& /*ev*/)
 {
        fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::append_event_unlocked_beats() called - should be impossible") << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
 }
 
 void
 MidiPlaylistSource::append_event_unlocked_frames(const Evoral::Event<framepos_t>& /* ev */, framepos_t /*source_start*/)
 {
        fatal << string_compose (_("programming error: %1"), "MidiPlaylistSource::append_event_unlocked_frames() called - should be impossible") << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
 }
 
 void

diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index a4a9342816375ac7ea8b8e34d9ef8c7c366fc8bc..de0780cdba5396d795ca0683350083c307f6a147 100644 (file)
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -120,7 +120,7 @@ PannerShell::configure_io (ChanCount in, ChanCount out)
        PannerInfo* pi = PannerManager::instance().select_panner (in, out, _user_selected_panner_uri);
        if (!pi) {
                fatal << _("No panner found: check that panners are being discovered correctly during startup.") << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        DEBUG_TRACE (DEBUG::Panning, string_compose (_("select panner: %1\n"), pi->descriptor.name.c_str()));

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 26b6aacd2a0ba68b5d4ed0f4dcc2bd456b153692..0c76b65c842feb16d3dad3662b04fe4ec0d80f27 100644 (file)
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -600,7 +600,7 @@ PluginInsert::default_parameter_value (const Evoral::Parameter& param)
        if (_plugins.empty()) {
                fatal << _("programming error: ") << X_("PluginInsert::default_parameter_value() called with no plugin")
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        return _plugins[0]->default_value (param.id());
@@ -646,7 +646,7 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
        fatal << string_compose (_("programming error: %1"),
                          X_("unknown plugin type in PluginInsert::plugin_factory"))
              << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return boost::shared_ptr<Plugin> ((Plugin*) 0);
 }
 

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 44f8c34ddd3be482fd5377805f83bce3371ae571..9654a4b3de530a6f78926aa066e826d983e1275f 100644 (file)
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -66,7 +66,7 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce)
        } else {
                fatal << _("programming error: RegionFactory::create() called with unknown Region type")
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (ret) {
@@ -108,7 +108,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& pli
        } else {
                fatal << _("programming error: RegionFactory::create() called with unknown Region type")
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return boost::shared_ptr<Region>();
        }
 
@@ -149,7 +149,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, c
        } else {
                fatal << _("programming error: RegionFactory::create() called with unknown Region type")
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return boost::shared_ptr<Region>();
        }
 
@@ -191,7 +191,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
        } else {
                fatal << _("programming error: RegionFactory::create() called with unknown Region type")
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        if (ret) {

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 87aadf4193ce339b8f5749829111b8f29785b59f..9d5fd619c3d486056c20e25dd5cc0792b3811f20 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -65,7 +65,7 @@ Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_b
                return string_compose (_("send %1"), (bitslot = s.next_send_id ()) + 1);
        default:
                fatal << string_compose (_("programming error: send created using role %1"), enum_2_string (r)) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return string();
        }
        

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 6807bed81286d674babbfbffe525a93a6a73750b..2878bb8014cff7580e93cc52249a5526c1246c35 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -2380,7 +2380,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                                /* generate a new name by adding a number to the end of the template name */
                                if (!find_route_name (route_name.c_str(), ++number, name, sizeof(name), true)) {
                                        fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
-                                       /*NOTREACHED*/
+                                       abort(); /*NOTREACHED*/
                                }
                        }
 
@@ -4041,7 +4041,7 @@ Session::available_capture_duration ()
                fatal << string_compose (_("programming error: %1"),
                                         X_("illegal native file data format"))
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
 
        double scale = 4096.0 / sample_bytes_on_disk;

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 497fbd4d2e1f437f32484f586300cc58e6f95a28..260c6c319adff5295f3f14d98970b15fe075b05e 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -1169,7 +1169,7 @@ Session::process_event (SessionEvent* ev)
 
        default:
          fatal << string_compose(_("Programming error: illegal event type in process_event (%1)"), ev->type) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                break;
        };
 

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 58fbab233b3f05bfa1d355a2817caa90e15529f5..5f1b31c640d1a2728e62c3bb71eedca1e5aa40fd 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -152,7 +152,7 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig
 
        default:
                fatal << string_compose (_("programming error: %1"), X_("unsupported audio header format requested")) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                break;
 
        }
@@ -459,7 +459,7 @@ SndFileSource::nondestructive_write_unlocked (Sample *data, framecnt_t cnt)
 
        if (_info.channels != 1) {
                fatal << string_compose (_("programming error: %1 %2"), X_("SndFileSource::write called on non-mono file"), _path) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return 0;
        }
 

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 621d1e2c747d0d30bfe4322184cee1db044b8b54..5e50e8e02b48dee0494ecc5a5826a417488f1146 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -677,7 +677,7 @@ TempoMap::first_meter () const
        }
 
        fatal << _("programming error: no tempo section in tempo map!") << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return *m;
 }
 
@@ -693,7 +693,7 @@ TempoMap::first_tempo () const
        }
 
        fatal << _("programming error: no tempo section in tempo map!") << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return *t;
 }
 
@@ -807,7 +807,7 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
                                rmeter = ms;
                        } else {
                                fatal << _("programming error: unhandled MetricSection type") << endmsg;
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                        }
                }
        }
@@ -1489,8 +1489,7 @@ TempoMap::round_to_type (framepos_t frame, int dir, BBTPointType type)
                break;
        }
 
-       /* NOTREACHED */
-       assert (false);
+       abort(); /* NOTREACHED */
        return 0;
 }
 
@@ -1532,6 +1531,7 @@ TempoMap::tempo_section_at (framepos_t frame) const
 
        if (prev == 0) {
                fatal << endmsg;
+               abort(); /*NOTREACHED*/
        }
 
        return *prev;
@@ -1785,7 +1785,7 @@ TempoMap::insert_time (framepos_t where, framecnt_t amount)
                                // cerr << "NEW METER, frame = " << (*i)->frame() << " start = " << (*i)->start() <<endl;
                        } else {
                                fatal << _("programming error: unhandled MetricSection type") << endmsg;
-                               /*NOTREACHED*/
+                               abort(); /*NOTREACHED*/
                        }
                        
                        prev = (*i);

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 03d75d9d79e6be33e7635d40bd9e52de5abd0263..1426c3926c4f947a52f71ccf0e3e947680d336e0 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -951,7 +951,7 @@ Track::monitoring_state () const
                }
        }
 
-       /* NOTREACHED */
+       abort(); /* NOTREACHED */
        return MonitoringSilence;
 }
 

diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 9c0aea885bba3d9213e2a1c8cdfc21731cd8e5bb..6d6511bb9f5f377c29d7cd4eb014fcdefe54e45f 100644 (file)
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -429,7 +429,7 @@ ARDOUR::string_to_edit_mode (string str)
                return Lock;
        }
        fatal << string_compose (_("programming error: unknown edit mode string \"%1\""), str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Slide;
 }
 
@@ -468,7 +468,7 @@ ARDOUR::string_to_sync_source (string str)
        }
 
        fatal << string_compose (_("programming error: unknown sync source string \"%1\""), str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Engine;
 }
 
@@ -577,7 +577,7 @@ ARDOUR::string_to_auto_state (std::string str)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoState string: ", str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Touch;
 }
 
@@ -601,7 +601,7 @@ ARDOUR::auto_state_to_string (AutoState as)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoState type: ", as) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return "";
 }
 
@@ -615,7 +615,7 @@ ARDOUR::string_to_auto_style (std::string str)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle string: ", str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Trim;
 }
 
@@ -634,7 +634,7 @@ ARDOUR::auto_style_to_string (AutoStyle as)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle type: ", as) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return "";
 }
 
@@ -669,7 +669,7 @@ ARDOUR::native_header_format_extension (HeaderFormat hf, const DataType& type)
         }
 
         fatal << string_compose (_("programming error: unknown native header format: %1"), hf);
-        /*NOTREACHED*/
+        abort(); /*NOTREACHED*/
         return ".wav";
 }
 

diff --git a/libs/evoral/evoral/PatchChange.hpp b/libs/evoral/evoral/PatchChange.hpp
index e05157aa92318abdf1ea81a357b3225b83058151..48ed0f9c13a5d07618e3b23e31aed0328ed1dcba 100644 (file)
--- a/libs/evoral/evoral/PatchChange.hpp
+++ b/libs/evoral/evoral/PatchChange.hpp
@@ -147,8 +147,7 @@ public:
                case 2:
                        return _program_change;
                default:
-                       abort ();
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                        return _program_change;
                }
        }

diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index 3f70cde2748f9c102c016345f0acd77916fa86fb..deabd9d1cc493ac7cd3bd564032991ebc772e1e5 100644 (file)
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -1199,7 +1199,7 @@ ControlList::unlocked_eval (double x) const
                return multipoint_eval (x);
        }
 
-       /*NOTREACHED*/ /* stupid gcc */
+       abort(); /*NOTREACHED*/ /* stupid gcc */
        return _default_value;
 }
 

diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index 4487bc43c4640284cb17dc31a77cf94ec1ed48e5..1cc8ff6e0fb3cadca14e78a5f74f10817fcd43dd 100644 (file)
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -1346,8 +1346,7 @@ Sequence<Time>::get_notes_by_pitch (Notes& n, NoteOperator op, uint8_t val, int
 
                default:
                        //fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_pitch() called with illegal operator"), op)) << endmsg;
-                       abort ();
-                       /* NOTREACHED*/
+                       abort(); /* NOTREACHED*/
                }
        }
 }
@@ -1392,8 +1391,7 @@ Sequence<Time>::get_notes_by_velocity (Notes& n, NoteOperator op, uint8_t val, i
                        break;
                default:
                        // fatal << string_compose (_("programming error: %1 %2", X_("get_notes_by_velocity() called with illegal operator"), op)) << endmsg;
-                       abort ();
-                       /* NOTREACHED*/
+                       abort(); /* NOTREACHED*/
 
                }
        }

diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index 5f853b0170a2a5686e520ce1dc5b527eaa782a77..666ac29c5c4d5a6ceecfb67000ea8ef71ae8179d 100644 (file)
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -490,7 +490,7 @@ ActionManager::set_toggleaction_state (string n, bool s)
 
        if (last_slash == 0) {
                fatal << string_compose ("programmer error: %1 %2", "illegal toggle action name", name) << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return;
        }
 

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index 6a490e1bb055c6be634968ba750e7303a42e0031..df7ec96324c7c71dc37d010efd1eb32d1d1ed265 100644 (file)
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -81,7 +81,7 @@ UI::UI (string namestr, int *argc, char ***argv)
                theGtkUI = this;
        } else {
                fatal << "duplicate UI requested" << endmsg;
-               /* NOTREACHED */
+               abort(); /* NOTREACHED */
        }
 
        /* the GUI event loop runs in the main thread of the app,

diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc
index 1a477c3b8caaf9f1aaacfabf86d2c4aa2431ec84..e2a018ca51ddda65af2b8ae18706279194a152c8 100644 (file)
--- a/libs/midi++2/mtc.cc
+++ b/libs/midi++2/mtc.cc
@@ -285,7 +285,7 @@ Parser::process_mtc_quarter_frame (MIDI::byte *msg)
                break;
 
        default:
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                break;
 
        } 

diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc
index cdcd9abdd7a9e40d3f0d97d7fba76b44e62d8442..234dfaeb184886b095c12a74a1fa7538a13f5c82 100644 (file)
--- a/libs/pbd/pool.cc
+++ b/libs/pbd/pool.cc
@@ -70,7 +70,7 @@ Pool::alloc ()
 
        if (free_list.read (&ptr, 1) < 1) {
                fatal << "CRITICAL: " << _name << " POOL OUT OF MEMORY - RECOMPILE WITH LARGER SIZE!!" << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
                return 0;
        } else {
                return ptr;
@@ -184,7 +184,7 @@ PerThreadPool::per_thread_pool ()
        CrossThreadPool* p = _key.get();
        if (!p) {
                fatal << "programming error: no per-thread pool \"" << _name << "\" for thread " << pthread_name() << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
        return p;
 }