From 8877452ec36d01a753221998f31b67700e595d54 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Tue, 11 Apr 2017 17:05:51 +0300 Subject: [core] TransitionOptions s/operator bool/isDefined/ --- include/mbgl/style/transition_options.hpp | 2 +- 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_) }; } } -- cgit v1.2.1