From eedeb4949d16e5415ba790a042c5db6d83580b36 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 27 Oct 2015 13:29:38 -0400 Subject: add const_cast to avoid compiler warnings from apple gcc --- gtk2_ardour/editor_routes.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gtk2_ardour/editor_routes.cc') diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index e4a48db5af..8d35a4a6a8 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -568,15 +568,15 @@ EditorRoutes::redisplay () } // model deprecated g_atomic_int_exchange_and_add(, 1) - g_atomic_int_inc(&_redisplay_active); - if (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 1)) { + g_atomic_int_inc(const_cast(&_redisplay_active)); + if (!g_atomic_int_compare_and_exchange (const_cast(&_redisplay_active), 1, 1)) { return; } redisplay_real (); - while (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 0)) { - g_atomic_int_set(&_redisplay_active, 1); + while (!g_atomic_int_compare_and_exchange (const_cast(&_redisplay_active), 1, 0)) { + g_atomic_int_set(const_cast(&_redisplay_active), 1); redisplay_real (); } } @@ -805,7 +805,7 @@ EditorRoutes::route_property_changed (const PropertyChange& what_changed, boost: void EditorRoutes::update_active_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -1581,7 +1581,7 @@ EditorRoutes::update_input_active_display () void EditorRoutes::update_rec_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -1589,7 +1589,7 @@ EditorRoutes::update_rec_display () bool EditorRoutes::idle_update_mute_rec_solo_etc() { - g_atomic_int_set (&_queue_tv_update, 0); + g_atomic_int_set (const_cast(&_queue_tv_update), 0); TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; @@ -1626,7 +1626,7 @@ EditorRoutes::idle_update_mute_rec_solo_etc() void EditorRoutes::update_mute_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -1634,7 +1634,7 @@ EditorRoutes::update_mute_display () void EditorRoutes::update_solo_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -1642,7 +1642,7 @@ EditorRoutes::update_solo_display () void EditorRoutes::update_solo_isolate_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -1650,7 +1650,7 @@ EditorRoutes::update_solo_isolate_display () void EditorRoutes::update_solo_safe_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } -- cgit v1.2.3