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

Fix several MSVC build issues #338

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Fix several MSVC build issues #338

merged 1 commit into from
Jan 10, 2024

Conversation

jherico
Copy link
Contributor

@jherico jherico commented Jan 5, 2024

Attempting to fix some of the issues preventing compilation on Windows platforms, in order to then fix the vcpkg version to also support windows, and finally to fix a downstream consumer of s2geometry so it can use vcpkg for the dependency.

Changes

The using Base::Base technique to import the base class ctors doesn't appear to import the base class default ctor if it would otherwise be implicitly deleted (be the declaration of a non-default ctor in this case), at least on MSVC 2022. See https://godbolt.org/z/EPnsMEq8v Clang and GCC both seem to handle this OK.

uint isn't a primitive type or a guaranteed typedef in C++. While Clang and GCC both appear to thread it as unsigned int, MSVC treats it as un unknown symbol. Replacing it with uint32_t seems to do the trick.

src/s2/s2point.h Show resolved Hide resolved
src/s2/s2builder.h Outdated Show resolved Hide resolved
@jmr jmr merged commit 1ff1671 into google:master Jan 10, 2024
1 check passed
@jmr
Copy link
Member

jmr commented Jan 10, 2024

Thanks!

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.

2 participants