summaryrefslogtreecommitdiff
path: root/platform/darwin/src/NSExpression+MGLAdditions.mm
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2018-11-19 19:19:07 -0500
committerJason Wray <jason@mapbox.com>2018-11-20 11:48:18 -0500
commitddcecdf7f7a190f5ddf5f48b45b52dedb186555c (patch)
tree8b51a6b1b39a659e4a148753afe32506d7629e00 /platform/darwin/src/NSExpression+MGLAdditions.mm
parent4519f8a867e50eccb3f85b683636de43924e7450 (diff)
downloadqtlocation-mapboxgl-ddcecdf7f7a190f5ddf5f48b45b52dedb186555c.tar.gz
[darwin] Rename variables to avoid shadow declarations
Per GCC_WARN_SHADOW.
Diffstat (limited to 'platform/darwin/src/NSExpression+MGLAdditions.mm')
-rw-r--r--platform/darwin/src/NSExpression+MGLAdditions.mm10
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm
index 0d6b74e93c..04152afffd 100644
--- a/platform/darwin/src/NSExpression+MGLAdditions.mm
+++ b/platform/darwin/src/NSExpression+MGLAdditions.mm
@@ -1117,14 +1117,14 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) {
format:@"Casting expression to %@ not yet implemented.", type];
} else if ([function isEqualToString:@"MGL_FUNCTION"] ||
[function isEqualToString:@"MGL_FUNCTION:"]) {
- NSExpression *op = self.arguments.firstObject;
- if (op.expressionType == NSConstantValueExpressionType
- && [op.constantValue isEqualToString:@"collator"]) {
+ NSExpression *firstOp = self.arguments.firstObject;
+ if (firstOp.expressionType == NSConstantValueExpressionType
+ && [firstOp.constantValue isEqualToString:@"collator"]) {
// Avoid wrapping collator options object in literal expression.
return @[@"collator", self.arguments[1].constantValue];
}
- if (op.expressionType == NSConstantValueExpressionType
- && [op.constantValue isEqualToString:@"format"]) {
+ if (firstOp.expressionType == NSConstantValueExpressionType
+ && [firstOp.constantValue isEqualToString:@"format"]) {
// Avoid wrapping format options object in literal expression.
return @[@"format", self.arguments[1].mgl_jsonExpressionObject, self.arguments[2].constantValue];
}