This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Cherry pick 7257 into iOS 3.4.0 release branch #7394
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
boundsj
added
crash
iOS
|
@boundsj, thanks for your PR! By analyzing this pull request, we identified @jfirebaugh, @1ec5 and @tmpsantos to be potential reviewers. |
|
0316614 was adjusted to account for #7250 (MGLOpenGLStyleLayer) |
1ec5
previously requested changes
Dec 13, 2016
| XCTAssertThrowsSpecificNamed([self.mapView.style insertLayer:[[MGLFillStyleLayer alloc] initWithIdentifier:@"my-layer" source:source] aboveLayer:initial], NSException, @"MGLRedundantLayerIdentifierException"); | ||
| XCTAssertThrowsSpecificNamed([self.mapView.style insertLayer:[[MGLFillStyleLayer alloc] initWithIdentifier:@"my-layer" source:source] atIndex:0], NSException, @"MGLRedundantLayerIdentifierException"); | ||
|
|
||
| #if TARGET_OS_IPHONE |
There was a problem hiding this comment.
MGLOpenGLStyleLayer is also available on macOS.
There was a problem hiding this comment.
I amended 7f7964d to remove the conditional for iPhone.
boundsj
force-pushed
the
boundsj-cherry-pick-7257
branch
from
0316614
to
7f7964d
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This brings in:
But not:
from #7257 which landed in
mastercc @1ec5 fyi @ivovandongen