diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-11 19:15:10 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 20:42:29 +0300 |
| commit | 2fae373fc9da1a5ed61b5114d8c982073734826d (patch) | |
| tree | 105ce580cc7df0cf9cf0a9997c4702bc76b3faeb /include/mbgl/style | |
| parent | 21031b624ffabf92bf284c830b3d13a3ae045460 (diff) | |
| download | qtlocation-mapboxgl-2fae373fc9da1a5ed61b5114d8c982073734826d.tar.gz | |
[core] GCC 4.9 is unable to deduce ctors when using bracket init
Diffstat (limited to 'include/mbgl/style')
| -rw-r--r-- | include/mbgl/style/transition_options.hpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp index 1583667025..6dad17aeb4 100644 --- a/include/mbgl/style/transition_options.hpp +++ b/include/mbgl/style/transition_options.hpp @@ -11,6 +11,11 @@ public: optional<Duration> duration = {}; optional<Duration> delay = {}; + TransitionOptions(optional<Duration> duration_ = optional<Duration>(), + optional<Duration> delay_ = optional<Duration>()) + : duration(std::move(duration_)), + delay(std::move(delay_)) {} + TransitionOptions reverseMerge(const TransitionOptions& defaults) const { return { duration ? duration : defaults.duration, |