diff options
| author | Ander Conselvan de Oliveira <ander.deoliveira@mapbox.com> | 2019-05-08 14:00:48 +0300 |
|---|---|---|
| committer | Ander Conselvan de Oliveira <ander.deoliveira@mapbox.com> | 2019-05-21 12:14:22 +0300 |
| commit | f210bbbb6c9532c5bdcf176e191bef9a0a9858c7 (patch) | |
| tree | cc719acba585ac048617830163ecd5bd62f94b0f /include | |
| parent | e30ff619c6d04e86295b63b642e137f449fc0907 (diff) | |
| download | qtlocation-mapboxgl-f210bbbb6c9532c5bdcf176e191bef9a0a9858c7.tar.gz | |
[core] Don't use optional unique_ptr in function coversion code
Since unique_ptr is already nullable there is no need to wrap it in an
optional<>.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/expression/dsl.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/mbgl/style/expression/dsl.hpp b/include/mbgl/style/expression/dsl.hpp index dc0f1ab90f..bcab999ab2 100644 --- a/include/mbgl/style/expression/dsl.hpp +++ b/include/mbgl/style/expression/dsl.hpp @@ -32,20 +32,20 @@ std::unique_ptr<Expression> literal(std::initializer_list<double> value); std::unique_ptr<Expression> literal(std::initializer_list<const char *> value); std::unique_ptr<Expression> assertion(type::Type, std::unique_ptr<Expression>, - optional<std::unique_ptr<Expression>> def = {}); + std::unique_ptr<Expression> def = nullptr); std::unique_ptr<Expression> number(std::unique_ptr<Expression>, - optional<std::unique_ptr<Expression>> def = {}); + std::unique_ptr<Expression> def = nullptr); std::unique_ptr<Expression> string(std::unique_ptr<Expression>, - optional<std::unique_ptr<Expression>> def = {}); + std::unique_ptr<Expression> def = nullptr); std::unique_ptr<Expression> boolean(std::unique_ptr<Expression>, - optional<std::unique_ptr<Expression>> def = {}); + std::unique_ptr<Expression> def = nullptr); std::unique_ptr<Expression> toColor(std::unique_ptr<Expression>, - optional<std::unique_ptr<Expression>> def = {}); + std::unique_ptr<Expression> def = nullptr); std::unique_ptr<Expression> toString(std::unique_ptr<Expression>, - optional<std::unique_ptr<Expression>> def = {}); + std::unique_ptr<Expression> def = nullptr); std::unique_ptr<Expression> toFormatted(std::unique_ptr<Expression>, - optional<std::unique_ptr<Expression>> def = {}); + std::unique_ptr<Expression> def = nullptr); std::unique_ptr<Expression> get(const char* value); std::unique_ptr<Expression> get(std::unique_ptr<Expression>); |