diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-07 17:00:53 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-23 13:31:13 -0700 |
commit | d7227e13a7a87cf50a4c8c1f0615fc565f5a2679 (patch) | |
tree | eda76a2da3220f3cfeec901400369cf9c8361f58 /include/mbgl/style/conversion/transition_options.hpp | |
parent | 1c757cce34344dfecc9a724034680225143f92b7 (diff) | |
download | qtlocation-mapboxgl-d7227e13a7a87cf50a4c8c1f0615fc565f5a2679.tar.gz |
[all] Replace Result<T> with optional<T> plus out Error parameter
Diffstat (limited to 'include/mbgl/style/conversion/transition_options.hpp')
-rw-r--r-- | include/mbgl/style/conversion/transition_options.hpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/mbgl/style/conversion/transition_options.hpp b/include/mbgl/style/conversion/transition_options.hpp index cdd65cfe9f..de8834d578 100644 --- a/include/mbgl/style/conversion/transition_options.hpp +++ b/include/mbgl/style/conversion/transition_options.hpp @@ -11,9 +11,10 @@ template <> struct Converter<TransitionOptions> { public: template <class V> - Result<TransitionOptions> operator()(const V& value) const { + optional<TransitionOptions> operator()(const V& value, Error& error) const { if (!isObject(value)) { - return Error { "transition must be an object" }; + error = { "transition must be an object" }; + return {}; } TransitionOptions result; @@ -22,7 +23,8 @@ public: if (duration) { auto number = toNumber(*duration); if (!number) { - return Error { "duration must be a number" }; + error = { "duration must be a number" }; + return {}; } result.duration = { std::chrono::milliseconds(int64_t(*number)) }; } @@ -31,7 +33,8 @@ public: if (delay) { auto number = toNumber(*delay); if (!number) { - return Error { "delay must be a number" }; + error = { "delay must be a number" }; + return {}; } result.delay = { std::chrono::milliseconds(int64_t(*number)) }; } |