cleanup: use initializer-list (required gcc >= 5)

tangrams · Jul 27, 2016 · 49b58e3 · 49b58e3
1 parent 05265dd
commit 49b58e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/core/src/labels/labelProperty.h b/core/src/labels/labelProperty.h
@@ -35,11 +35,6 @@ struct Anchors {
         return anchor == _other.anchor && count == _other.count;
     }
 
-    // For GCC<5
-    Anchors(std::array<LabelProperty::Anchor, LabelProperty::max_anchors> _anchor, int _count)
-        : anchor(_anchor), count(_count) {}
-
-    Anchors() : count(0) {}
 };
 
 bool anchor(const std::string& _transform, Anchor& _out);

diff --git a/core/src/style/textStyleBuilder.cpp b/core/src/style/textStyleBuilder.cpp
@@ -313,15 +313,15 @@ TextStyle::Parameters TextStyleBuilder::applyRule(const DrawRule& _rule,
 
         _rule.get(StyleParamKey::text_anchor, p.labelOptions.anchors);
         if (p.labelOptions.anchors.count == 0) {
-            p.labelOptions.anchors = LabelProperty::Anchors({
+            p.labelOptions.anchors = {{
                     {LabelProperty::Anchor::bottom,
                      LabelProperty::Anchor::top,
                      LabelProperty::Anchor::right,
                      LabelProperty::Anchor::left,
                      LabelProperty::Anchor::bottom_right,
                      LabelProperty::Anchor::bottom_left,
                      LabelProperty::Anchor::top_right,
-                     LabelProperty::Anchor::top_left}}, 8);
+                     LabelProperty::Anchor::top_left}}, 8};
         }
     } else {
         if (_rule.get(StyleParamKey::priority, priority)) {
@@ -334,8 +334,8 @@ TextStyle::Parameters TextStyleBuilder::applyRule(const DrawRule& _rule,
 
         _rule.get(StyleParamKey::anchor, p.labelOptions.anchors);
         if (p.labelOptions.anchors.count == 0) {
-            p.labelOptions.anchors = LabelProperty::Anchors({
-                    {LabelProperty::Anchor::center}}, 1);
+            p.labelOptions.anchors = {{
+                    {LabelProperty::Anchor::center}}, 1};
         }
     }