Revert "Odd const fix."
authorCarl Hetherington <cth@carlh.net>
Tue, 21 Jun 2016 22:08:36 +0000 (23:08 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 21 Jun 2016 22:08:36 +0000 (23:08 +0100)
This reverts commit b4f9d2e2c287848623c6dc59d8768c1d5fae15f0.

src/wx/timeline.cc

index 8633e47b9bc0e639378ca006f96916ade00ec2b2..ef8549d4253795f6c6edebe6fcfa71fe358b2e03 100644 (file)
@@ -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<Content> i, film->content ()) {
                if (i->video) {
-                       _views.push_back (shared_ptr<TimelineContentView> (new TimelineVideoContentView (*this, i)));
+                       _views.push_back (make_shared<TimelineVideoContentView> (*this, i));
                }
 
                if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) {
-                       _views.push_back (shared_ptr<TimelineContentView> (new TimelineAudioContentView (*this, i)));
+                       _views.push_back (make_shared<TimelineAudioContentView> (*this, i));
                }
 
                if (i->subtitle) {
-                       _views.push_back (shared_ptr<TimelineContentView> (new TimelineSubtitleContentView (*this, i)));
+                       _views.push_back (make_shared<TimelineSubtitleContentView> (*this, i));
                }
 
                if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
-                       _views.push_back (shared_ptr<TimelineContentView> (new TimelineAtmosContentView (*this, i)));
+                       _views.push_back (make_shared<TimelineAtmosContentView> (*this, i));
                }
        }