diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-11-14 16:58:27 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-11-14 17:07:46 +0200 |
commit | 13587da3114f5da38489e8cdbb3898a1b734faef (patch) | |
tree | 2af52e3df826911866314cc0abb0a5bfcd465087 | |
parent | 93a4ec2fba551e4bb0d95bee18d17f426f95d929 (diff) | |
download | qtlocation-mapboxgl-upstream/qt-ci-buildfix.tar.gz |
[build] Clang-3.8: Explicit mbgl::style::expression::Result default ctorupstream/qt-ci-buildfix
-rw-r--r-- | include/mbgl/style/expression/expression.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp index 1954d8b090..dc9fdb3d7a 100644 --- a/include/mbgl/style/expression/expression.hpp +++ b/include/mbgl/style/expression/expression.hpp @@ -44,6 +44,8 @@ public: using variant<EvaluationError, T>::variant; using Value = T; + constexpr Result() = default; + explicit operator bool () const { return this->template is<T>(); } @@ -80,6 +82,8 @@ class EvaluationResult : public Result<Value> { public: using Result::Result; // NOLINT + constexpr EvaluationResult() = default; + EvaluationResult(const std::array<double, 4>& arr) : Result(toExpressionValue(arr)) {} |