diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-04-11 17:05:51 +0300 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-14 12:33:13 -0700 |
| commit | 8877452ec36d01a753221998f31b67700e595d54 (patch) | |
| tree | b58b31227e24221f685ea46f3057daf3c48ff382 | |
| parent | 04a3a7383a0ced32b852a28337de56479a8af26a (diff) | |
| download | qtlocation-mapboxgl-8877452ec36d01a753221998f31b67700e595d54.tar.gz | |
[core] TransitionOptions s/operator bool/isDefined/
| -rw-r--r-- | include/mbgl/style/transition_options.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/paint_property.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp index e2a156e665..1583667025 100644 --- a/include/mbgl/style/transition_options.hpp +++ b/include/mbgl/style/transition_options.hpp @@ -18,7 +18,7 @@ public: }; } - explicit operator bool() const { + bool isDefined() const { return duration || delay; } }; diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index 6fe53de573..623acef804 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -35,7 +35,7 @@ public: : begin(now + transition.delay.value_or(Duration::zero())), end(begin + transition.duration.value_or(Duration::zero())), value(std::move(value_)) { - if (transition) { + if (transition.isDefined()) { prior = { std::move(prior_) }; } } |