Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FeatureId::propertyTable usage to fit with cesium-native changes #1431

Merged
merged 6 commits into from
May 29, 2024

Conversation

azrogers
Copy link
Contributor

FeatureId::propertyTable is now no longer an std::optional, which requires a few small changes.

@azrogers azrogers changed the title Update FeatureId to fit with cesium-native changes Update FeatureId::propertyTable usage to fit with cesium-native changes May 24, 2024
@j9liu
Copy link
Contributor

j9liu commented May 24, 2024

Thanks @azrogers ! I'll wait for CI to pass before I merge.

@j9liu
Copy link
Contributor

j9liu commented May 24, 2024

Unfortunately it seems like iOS isn't happy with the recent cesium-native changes :/

It seems like these are the culprits:

/Users/runner/work/cesium-unreal/cesium-unreal/extern/cesium-native/CesiumUtility/src/Uri.cpp:270:38: error: 'path' is unavailable: introduced in iOS 13.0
  if constexpr (std::filesystem::path::preferred_separator == '\\') {
                                     ^
In file included from /Users/runner/work/cesium-unreal/cesium-unreal/extern/cesium-native/CesiumUtility/src/Uri.cpp:9:
/Applications/Xcode_14.2.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/usr/include/c++/v1/filesystem:909:24: note: 'path' has been explicitly marked unavailable here
class _LIBCPP_TYPE_VIS path {
                       ^
/Users/runner/work/cesium-unreal/cesium-unreal/extern/cesium-native/CesiumUtility/src/Uri.cpp:322:38: error: 'path' is unavailable: introduced in iOS 13.0
  if constexpr (std::filesystem::path::preferred_separator == '\\') {
                                     ^
In file included from /Users/runner/work/cesium-unreal/cesium-unreal/extern/cesium-native/CesiumUtility/src/Uri.cpp:9:
/Applications/Xcode_14.2.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.2.sdk/usr/include/c++/v1/filesystem:909:24: note: 'path' has been explicitly marked unavailable here
class _LIBCPP_TYPE_VIS path {
                       ^
2 errors generated.

@kring
Copy link
Member

kring commented May 27, 2024

I fixed the above by updating cesium-native to inclue CesiumGS/cesium-native#891, so merge that first.

@kring
Copy link
Member

kring commented May 27, 2024

This PR now updates cesium-native to include CesiumGS/cesium-native#892 too.

@csciguy8
Copy link
Contributor

This looks ready to go. I'll merge unless there are objections...

@csciguy8 csciguy8 merged commit da997c3 into main May 29, 2024
25 checks passed
@csciguy8 csciguy8 deleted the fix-feature-id branch May 29, 2024 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants