From da4d735e2c465195e0fb9531ce9d4d7c5c9e6503 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 10 May 2017 11:34:00 -0700
Subject: [core] Unify {Paint,Layout,Light}Properties

---
 src/mbgl/layout/symbol_layout.cpp | 4 ++--
 src/mbgl/layout/symbol_layout.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mbgl/layout')

diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp
index 5142584c91..0e8b2fa636 100644
--- a/src/mbgl/layout/symbol_layout.cpp
+++ b/src/mbgl/layout/symbol_layout.cpp
@@ -50,8 +50,8 @@ SymbolLayout::SymbolLayout(const BucketParameters& parameters,
       mode(parameters.mode),
       tileSize(util::tileSize * overscaling),
       tilePixelRatio(float(util::EXTENT) / tileSize),
-      textSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.unevaluated.get<TextSize>()),
-      iconSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.unevaluated.get<IconSize>())
+      textSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.get<TextSize>()),
+      iconSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.get<IconSize>())
     {
 
     const SymbolLayer::Impl& leader = layers.at(0)->as<RenderSymbolLayer>()->impl();
diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp
index 7d19aba671..7bdcf52f91 100644
--- a/src/mbgl/layout/symbol_layout.hpp
+++ b/src/mbgl/layout/symbol_layout.hpp
@@ -47,7 +47,7 @@ public:
     State state = Pending;
 
     std::map<std::string,
-        std::pair<style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>> layerPaintProperties;
+        std::pair<style::IconPaintProperties::PossiblyEvaluated, style::TextPaintProperties::PossiblyEvaluated>> layerPaintProperties;
 
 private:
     void addFeature(const size_t,
-- 
cgit v1.2.1