From cadc617c762d453cca2c9bac41f9c1db984c5fac Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 25 Apr 2016 13:59:09 -0700
Subject: [core] Introduce PropertyValue<T>

PropertyValue<T> represents the three possible types of style property value: undefined, constant, or function.
---
 include/mbgl/layer/circle_layer.hpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'include/mbgl/layer/circle_layer.hpp')

diff --git a/include/mbgl/layer/circle_layer.hpp b/include/mbgl/layer/circle_layer.hpp
index 14b9da895f..28e5c2fa7a 100644
--- a/include/mbgl/layer/circle_layer.hpp
+++ b/include/mbgl/layer/circle_layer.hpp
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/property_value.hpp>
 
 namespace mbgl {
 
@@ -19,23 +20,23 @@ public:
 
     // Paint properties
 
-    Function<float> getCircleRadius() const;
-    void setCircleRadius(Function<float>);
+    PropertyValue<float> getCircleRadius() const;
+    void setCircleRadius(PropertyValue<float>);
 
-    Function<Color> getCircleColor() const;
-    void setCircleColor(Function<Color>);
+    PropertyValue<Color> getCircleColor() const;
+    void setCircleColor(PropertyValue<Color>);
 
-    Function<float> getCircleBlur() const;
-    void setCircleBlur(Function<float>);
+    PropertyValue<float> getCircleBlur() const;
+    void setCircleBlur(PropertyValue<float>);
 
-    Function<float> getCircleOpacity() const;
-    void setCircleOpacity(Function<float>);
+    PropertyValue<float> getCircleOpacity() const;
+    void setCircleOpacity(PropertyValue<float>);
 
-    Function<std::array<float, 2>> getCircleTranslate() const;
-    void setCircleTranslate(Function<std::array<float, 2>>);
+    PropertyValue<std::array<float, 2>> getCircleTranslate() const;
+    void setCircleTranslate(PropertyValue<std::array<float, 2>>);
 
-    Function<TranslateAnchorType> getCircleTranslateAnchor() const;
-    void setCircleTranslateAnchor(Function<TranslateAnchorType>);
+    PropertyValue<TranslateAnchorType> getCircleTranslateAnchor() const;
+    void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>);
 
     // Private implementation
 
-- 
cgit v1.2.1