summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmkiley <jordan.kiley@mapbox.com>2019-09-05 12:14:23 -0700
committerjmkiley <jordan.kiley@mapbox.com>2019-09-25 14:28:56 -0700
commit3e7dd450bbcae75de2e24b0e23d8bffa5854001d (patch)
treeb7ddf6b45f3c80669514ac4e46fe531940ed5a96
parentf788f87e5a948ff99f7b3352288f69ef4e602613 (diff)
downloadqtlocation-mapboxgl-3e7dd450bbcae75de2e24b0e23d8bffa5854001d.tar.gz
[ios] update errors
-rw-r--r--platform/darwin/src/MGLShapeSource.mm16
1 files changed, 8 insertions, 8 deletions
diff --git a/platform/darwin/src/MGLShapeSource.mm b/platform/darwin/src/MGLShapeSource.mm
index 837a197700..f8fa541133 100644
--- a/platform/darwin/src/MGLShapeSource.mm
+++ b/platform/darwin/src/MGLShapeSource.mm
@@ -107,19 +107,19 @@ mbgl::style::GeoJSONOptions MGLGeoJSONOptionsFromDictionary(NSDictionary<MGLShap
NSExpression *exp1 = expArray[0];
NSExpression *exp2 = expArray[1];
// convert values into style expressions. IDK how to do this, but ¯\_(ツ)_/¯
-
- // Static_assert failed due to requirement 'is_constructible<mbgl::style::PropertyExpression<std::__1::basic_string<char> >, const mbgl::style::expression::Expression **>::value' "Can't construct object in make_shared"
auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(exp1, true);
- auto mbglExpression1 = &mbglValue.PropertyValue::asExpression().getExpression();
- const auto sharedExpressionPtr1 = std::make_shared<mbgl::style::PropertyExpression<std::string>>(&mbglExpression1);
+ auto& mbglExpression1 = mbglValue.PropertyValue::asExpression().getExpression();
+
+ auto sharedExpressionPtr1 = std::make_shared<mbgl::style::expression::Expression>(mbglExpression1);
+ sharedExpressionPtr1.reset();
auto mbglValue2 = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(exp2, true);
auto& mbglExpression2 = mbglValue2.PropertyValue::asExpression().getExpression();
+ auto sharedExpressionPtr2 = std::make_shared<mbgl::style::expression::Expression>(mbglExpression2);
- const auto sharedExpressionPtr2 = std::make_shared<mbgl::style::PropertyExpression<std::string>>(mbglExpression2);
-
-//
-//
+ // Static_assert failed due to requirement 'is_constructible<mbgl::style::expression::Expression, const mbgl::style::expression::Expression &>::value' "Can't construct object in make_shared"
+ // Assigning to 'std::__1::__shared_weak_count *' from incompatible type 'std::__1::unique_ptr<std::__1::__shared_ptr_emplace<mbgl::style::expression::Expression, std::__1::allocator<mbgl::style::expression::Expression> >, std::__1::__allocator_destructor<std::__1::allocator<std::__1::__shared_ptr_emplace<mbgl::style::expression::Expression, std::__1::allocator<mbgl::style::expression::Expression> > > > >::pointer' (aka 'std::__1::__shared_ptr_emplace<mbgl::style::expression::Expression, std::__1::allocator<mbgl::style::expression::Expression> > *')
+// Field type 'mbgl::style::expression::Expression' is an abstract class
mbgl::style::GeoJSONOptions::ClusterExpression mbglPair = std::make_pair(sharedExpressionPtr1, sharedExpressionPtr2);
std::string keyString = std::string([key UTF8String]);