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 the order of #endif for non X64 and compiling in cpp #464

Merged
merged 1 commit into from
Apr 18, 2023

Conversation

SalvatorePreviti
Copy link
Contributor

It seems that when compiling croaring in C++ in a non X64 machine the compilation fails.
The reason seems to be the fact that

#ifdef __cplusplus
} } }  // extern "C" { namespace roaring { namespace internal {
#endif

must be after #endif // defined(__x86_64__) || defined(_M_AMD64) // x64 and not before

Changes:

  • fix the order of #endif for when defined(x86_64) || defined(_M_AMD64) is false and __cplusplus is true

@SalvatorePreviti SalvatorePreviti requested a review from lemire April 18, 2023 22:12
@lemire lemire merged commit 14aa2c8 into master Apr 18, 2023
@lemire
Copy link
Member

lemire commented Apr 18, 2023

I will issue a release.

@SalvatorePreviti SalvatorePreviti deleted the fix-isadetection-c-ifdef-cplusplus branch April 18, 2023 23:13
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