[core] Move expression.cpp to expression directory

2018-07-16 16:12:09 -07:00
parent c8edbb0500
commit a3d988ab85
2 changed files with 1 additions and 3 deletions
--- 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
--- a/src/mbgl/style/expression/expression.cpp
+++ b/src/mbgl/style/expression/expression.cpp