From c86512f73e6ce1efbbad78aeaf49df91df1a58f1 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Tue, 13 Dec 2016 10:12:07 +0100 Subject: [PATCH] Fixed initialization error with some compilers --- src/animation/shapeRule.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/animation/shapeRule.cpp b/src/animation/shapeRule.cpp index 9ea6424..52b48f8 100644 --- a/src/animation/shapeRule.cpp +++ b/src/animation/shapeRule.cpp @@ -18,7 +18,7 @@ ContinuousTimeline getShapeRules(const BoundedTimeline& phones auto continuousPhones = boundedTimelinetoContinuousOptional(phones); // Create timeline of shape rules - ContinuousTimeline shapeRules(phones.getRange(), {{Shape::X}, boost::none}); + ContinuousTimeline shapeRules(phones.getRange(), ShapeRule({Shape::X}, boost::none)); centiseconds previousDuration = 0_cs; for (const auto& timedPhone : continuousPhones) { optional phone = timedPhone.getValue(); @@ -34,7 +34,7 @@ ContinuousTimeline getShapeRules(const BoundedTimeline& phones // Copy to timeline. // Later shape sets may overwrite earlier ones if overlapping. for (const auto& timedShapeSet : phoneShapeSets) { - shapeRules.set(timedShapeSet.getTimeRange(), {timedShapeSet.getValue(), phone}); + shapeRules.set(timedShapeSet.getTimeRange(), ShapeRule(timedShapeSet.getValue(), phone)); } }