summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmkiley <jordan.kiley@mapbox.com>2019-09-03 12:09:51 -0700
committerjmkiley <jordan.kiley@mapbox.com>2019-09-25 14:28:56 -0700
commit3208b71c7d2f0b702b6ae508244b86159f5d2721 (patch)
tree81184cb4a2f6e744b0be3d6991aaa66f0db9e9b6
parent0c648b841d9cb15e520bb961043701f19fe5112a (diff)
downloadqtlocation-mapboxgl-3208b71c7d2f0b702b6ae508244b86159f5d2721.tar.gz
[ios] Use auto&
-rw-r--r--platform/darwin/src/MGLShapeSource.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLShapeSource.mm b/platform/darwin/src/MGLShapeSource.mm
index 8a45c7a8f6..52920df35b 100644
--- a/platform/darwin/src/MGLShapeSource.mm
+++ b/platform/darwin/src/MGLShapeSource.mm
@@ -112,12 +112,12 @@ mbgl::style::GeoJSONOptions MGLGeoJSONOptionsFromDictionary(NSDictionary<MGLShap
// auto mbglValue = MGLSt
auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(exp1, true);
- const mbgl::style::expression::Expression *mbglValue3 = &mbglValue.PropertyValue::asExpression().getExpression();
+ const auto& mbglExpression1 = &mbglValue.PropertyValue::asExpression().getExpression();
auto mbglValue2 = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(exp2, true);
- const mbgl::style::expression::Expression *mbgl4 = &mbglValue2.PropertyValue::asExpression().getExpression();
-// No viable conversion from 'pair<typename __unwrap_ref_decay<PropertyValue<basic_string<char> > &>::type, typename __unwrap_ref_decay<PropertyValue<basic_string<char> > &>::type>' to 'pair<std::shared_ptr<mbgl::style::expression::Expression>, std::shared_ptr<mbgl::style::expression::Expression>>'
+ const auto& mbglExpression2 = &mbglValue2.PropertyValue::asExpression().getExpression();
+// No viable conversion from 'pair<typename __unwrap_ref_decay<const Expression *&>::type, typename __unwrap_ref_decay<const Expression *&>::type>' to 'pair<std::shared_ptr<mbgl::style::expression::Expression>, std::shared_ptr<mbgl::style::expression::Expression>>'
//
- mbgl::style::GeoJSONOptions::ClusterExpression mbglPair = std::make_pair(mbglValue3, mbgl4);
+ mbgl::style::GeoJSONOptions::ClusterExpression mbglPair = std::make_pair(mbglExpression1, mbglExpression2);
std::string keyString = std::string([key UTF8String]);