diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-11-14 19:03:36 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-11-14 19:03:52 +0200 |
commit | 572822c8ca15be190b43afbf7f91d132e988bf21 (patch) | |
tree | c24dab79ac4f778769e7025155aa7790ced81d4e | |
parent | 82812ea533ad57ace2eb49edecffd88be5d97614 (diff) | |
download | qtlocation-mapboxgl-572822c8ca15be190b43afbf7f91d132e988bf21.tar.gz |
Bump Mapbox GL Native
mapbox-gl-native @ 3bef7593a64a51e86dd5a2ed9fd36b4a143350b0
-rw-r--r-- | include/mbgl/style/expression/expression.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/style/expression/type.hpp | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp index 1954d8b090..a22fc28724 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; + 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 + EvaluationResult() = default; + EvaluationResult(const std::array<double, 4>& arr) : Result(toExpressionValue(arr)) {} diff --git a/include/mbgl/style/expression/type.hpp b/include/mbgl/style/expression/type.hpp index da59eb001c..513c4bdc17 100644 --- a/include/mbgl/style/expression/type.hpp +++ b/include/mbgl/style/expression/type.hpp @@ -14,49 +14,49 @@ template <class T> std::string toString(const T& t); struct NullType { - constexpr NullType() = default; + constexpr NullType() {}; std::string getName() const { return "null"; } bool operator==(const NullType&) const { return true; } }; struct NumberType { - constexpr NumberType() = default; + constexpr NumberType() {}; std::string getName() const { return "number"; } bool operator==(const NumberType&) const { return true; } }; struct BooleanType { - constexpr BooleanType() = default; + constexpr BooleanType() {}; std::string getName() const { return "boolean"; } bool operator==(const BooleanType&) const { return true; } }; struct StringType { - constexpr StringType() = default; + constexpr StringType() {}; std::string getName() const { return "string"; } bool operator==(const StringType&) const { return true; } }; struct ColorType { - constexpr ColorType() = default; + constexpr ColorType() {}; std::string getName() const { return "color"; } bool operator==(const ColorType&) const { return true; } }; struct ObjectType { - constexpr ObjectType() = default; + constexpr ObjectType() {}; std::string getName() const { return "object"; } bool operator==(const ObjectType&) const { return true; } }; struct ErrorType { - constexpr ErrorType() = default; + constexpr ErrorType() {}; std::string getName() const { return "error"; } bool operator==(const ErrorType&) const { return true; } }; struct ValueType { - constexpr ValueType() = default; + constexpr ValueType() {}; std::string getName() const { return "value"; } bool operator==(const ValueType&) const { return true; } }; |