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/darwin | |
| parent | 1c757cce34344dfecc9a724034680225143f92b7 (diff) | |
| download | qtlocation-mapboxgl-d7227e13a7a87cf50a4c8c1f0615fc565f5a2679.tar.gz | |
[all] Replace Result<T> with optional<T> plus out Error parameter
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/src/MGLStyleValue_Private.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h index 90d6622c93..263b54d7e5 100644 --- a/platform/darwin/src/MGLStyleValue_Private.h +++ b/platform/darwin/src/MGLStyleValue_Private.h @@ -123,8 +123,9 @@ public: return toMBGLConstantValue((MGLConstantStyleValue<ObjCType> *)value); } else if ([value isKindOfClass:[MGLStyleFunction class]]) { auto rawValue = toRawStyleSpecValue((MGLStyleFunction<ObjCType> *) value); - auto result = mbgl::style::conversion::convert<mbgl::style::DataDrivenPropertyValue<MBGLType>>(rawValue); - NSCAssert(result, @(result.error().message.c_str())); + mbgl::style::conversion::Error error; + auto result = mbgl::style::conversion::convert<mbgl::style::DataDrivenPropertyValue<MBGLType>>(rawValue, error); + NSCAssert(result, @(error.message.c_str())); return *result; } else { return {}; |