Fix CesiumGltf namespace problems. #1548
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
The version we were using previously is no longer available on the GH runners.
|
This PR also moves from xcode 14.3.1 to xcode 15.4, because 14.3.1 is no longer installed on the GitHub Actions macos-14 runners. |
|
@kring is this ready to merge? The changes look good to me and it looks like CI passed 😄 |
|
Yes it should be @j9liu! |
|
Thanks @kring ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In #1521, we worked around a strange macOS compilation problem (conflict between Cocoa
Classand theClassinCesiumGltf) by removing occurrences ofusing namespace CesiumGltf. But we missed one. And because of this one we missed, combined with Unreal's unity build system, we also missed adding the necessaryCesiumGltf::in two source files. This PR fixes both problems.Fixes #1547.