From 94cee20beaa2d557c3c47960d8a65501c37410c2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 21 Jun 2016 23:08:36 +0100 Subject: [PATCH] Revert "Odd const fix." This reverts commit b4f9d2e2c287848623c6dc59d8768c1d5fae15f0. --- src/wx/timeline.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 8633e47b9..ef8549d42 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -150,23 +150,21 @@ Timeline::recreate_views () _views.push_back (_reels_view); _views.push_back (_labels_view); - /* XXX: make_shared does not work here on some compilers due to some strange const problem */ - BOOST_FOREACH (shared_ptr i, film->content ()) { if (i->video) { - _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); + _views.push_back (make_shared (*this, i)); } if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { - _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); + _views.push_back (make_shared (*this, i)); } if (i->subtitle) { - _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); + _views.push_back (make_shared (*this, i)); } if (dynamic_pointer_cast (i)) { - _views.push_back (shared_ptr (new TimelineAtmosContentView (*this, i))); + _views.push_back (make_shared (*this, i)); } } -- 2.30.2