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 /platform/android/src/style/layers/layer.cpp | |
| parent | 1c757cce34344dfecc9a724034680225143f92b7 (diff) | |
| download | qtlocation-mapboxgl-d7227e13a7a87cf50a4c8c1f0615fc565f5a2679.tar.gz | |
[all] Replace Result<T> with optional<T> plus out Error parameter
Diffstat (limited to 'platform/android/src/style/layers/layer.cpp')
| -rw-r--r-- | platform/android/src/style/layers/layer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index dbf71fd2af..6e93cf4daf 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -104,9 +104,10 @@ namespace android { Value wrapped(env, jfilter); Filter filter; - Result<Filter> converted = convert<Filter>(wrapped); + Error error; + optional<Filter> converted = convert<Filter>(wrapped, error); if (!converted) { - mbgl::Log::Error(mbgl::Event::JNI, "Error setting filter: " + converted.error().message); + mbgl::Log::Error(mbgl::Event::JNI, "Error setting filter: " + error.message); return; } filter = std::move(*converted); |