From 684000fc263ac6c4064e80505bd1a2f6c15fb0fa Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Mon, 2 Dec 2019 16:09:06 +0200
Subject: [core] Merge style::Layer::set{Layout,Paint}Property

---
 include/mbgl/style/layers/heatmap_layer.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/mbgl/style/layers/heatmap_layer.hpp')

diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp
index 2dec03b927..ae3eb22214 100644
--- a/include/mbgl/style/layers/heatmap_layer.hpp
+++ b/include/mbgl/style/layers/heatmap_layer.hpp
@@ -22,8 +22,7 @@ public:
     ~HeatmapLayer() final;
 
     // Dynamic properties
-    optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
-    optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
+    optional<conversion::Error> setProperty(const std::string& name, const conversion::Convertible& value) final;
 
     StyleProperty getProperty(const std::string& name) const final;
 
-- 
cgit v1.2.1