summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-07-16 16:12:09 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-07-20 11:56:30 -0700
commita3d988ab8520ea12272bb80a746a2d91cbc332f5 (patch)
treec93f34553fe7ebe1055b9563f413a8a415c34b05
parentc8edbb0500cbf4baf1d5fdb0e63679539e166585 (diff)
downloadqtlocation-mapboxgl-a3d988ab8520ea12272bb80a746a2d91cbc332f5.tar.gz
[core] Move expression.cpp to expression directory
-rw-r--r--cmake/core-files.cmake4
-rw-r--r--src/mbgl/style/expression/expression.cpp (renamed from src/mbgl/style/function/expression.cpp)0
2 files changed, 1 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 2aae6e4573..d2244d14a8 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -484,6 +484,7 @@ set(MBGL_CORE_FILES
src/mbgl/style/expression/compound_expression.cpp
src/mbgl/style/expression/dsl.cpp
src/mbgl/style/expression/equals.cpp
+ src/mbgl/style/expression/expression.cpp
src/mbgl/style/expression/find_zoom_curve.cpp
src/mbgl/style/expression/get_covering_stops.cpp
src/mbgl/style/expression/interpolate.cpp
@@ -499,9 +500,6 @@ set(MBGL_CORE_FILES
src/mbgl/style/expression/util.hpp
src/mbgl/style/expression/value.cpp
- # style/function
- src/mbgl/style/function/expression.cpp
-
# style/layers
include/mbgl/style/layers/background_layer.hpp
include/mbgl/style/layers/circle_layer.hpp
diff --git a/src/mbgl/style/function/expression.cpp b/src/mbgl/style/expression/expression.cpp
index d9dbbfa1d3..d9dbbfa1d3 100644
--- a/src/mbgl/style/function/expression.cpp
+++ b/src/mbgl/style/expression/expression.cpp