1 files changed, 8 insertions, 7 deletions
diff --git a/src/mbgl/style/expression/dsl.cpp b/src/mbgl/style/expression/dsl.cpp
index c8d98e61a4..d8c105633f 100644
--- a/src/mbgl/style/expression/dsl.cpp
+++ b/src/mbgl/style/expression/dsl.cpp
@@ -11,9 +11,10 @@
 #include <mbgl/style/expression/literal.hpp>
 #include <mbgl/style/expression/step.hpp>
 
+#include <rapidjson/document.h>
 #include <mapbox/geojsonvt.hpp>
 #include <mbgl/style/conversion/json.hpp>
-#include <rapidjson/document.h>
+#include <utility>
 
 namespace mbgl {
 namespace style {
@@ -54,7 +55,7 @@ std::unique_ptr<Expression> literal(const char* value) {
     return literal(std::string(value));
 }
 
-std::unique_ptr<Expression> literal(Value value) {
+std::unique_ptr<Expression> literal(const Value& value) {
     return std::make_unique<Literal>(value);
 }
 
@@ -74,7 +75,7 @@ std::unique_ptr<Expression> literal(std::initializer_list<const char *> value) {
     return literal(values);
 }
 
-std::unique_ptr<Expression> assertion(type::Type type,
+std::unique_ptr<Expression> assertion(const type::Type& type,
                                       std::unique_ptr<Expression> value,
                                       std::unique_ptr<Expression> def) {
     std::vector<std::unique_ptr<Expression>> v  = vec(std::move(value));
@@ -99,7 +100,7 @@ std::unique_ptr<Expression> boolean(std::unique_ptr<Expression> value,
     return assertion(type::Boolean, std::move(value), std::move(def));
 }
 
-std::unique_ptr<Expression> coercion(type::Type type,
+std::unique_ptr<Expression> coercion(const type::Type& type,
                                      std::unique_ptr<Expression> value,
                                      std::unique_ptr<Expression> def) {
     std::vector<std::unique_ptr<Expression>> v = vec(std::move(value));
@@ -193,7 +194,7 @@ std::unique_ptr<Expression> interpolate(Interpolator interpolator,
     std::map<double, std::unique_ptr<Expression>> stops;
     stops[input1] = std::move(output1);
     ParsingContext ctx;
-    ParseResult result = createInterpolate(type, interpolator, std::move(input), std::move(stops), ctx);
+    ParseResult result = createInterpolate(type, std::move(interpolator), std::move(input), std::move(stops), ctx);
     assert(result);
     return std::move(*result);
 }
@@ -207,7 +208,7 @@ std::unique_ptr<Expression> interpolate(Interpolator interpolator,
     stops[input1] = std::move(output1);
     stops[input2] = std::move(output2);
     ParsingContext ctx;
-    ParseResult result = createInterpolate(type, interpolator, std::move(input), std::move(stops), ctx);
+    ParseResult result = createInterpolate(type, std::move(interpolator), std::move(input), std::move(stops), ctx);
     assert(result);
     return std::move(*result);
 }
@@ -223,7 +224,7 @@ std::unique_ptr<Expression> interpolate(Interpolator interpolator,
     stops[input2] = std::move(output2);
     stops[input3] = std::move(output3);
     ParsingContext ctx;
-    ParseResult result = createInterpolate(type, interpolator, std::move(input), std::move(stops), ctx);
+    ParseResult result = createInterpolate(type, std::move(interpolator), std::move(input), std::move(stops), ctx);
     assert(result);
     return std::move(*result);
 }