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.

Sign up for GitHub

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 compilation of MathExtras.h on Windows with /sdl #5809

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Fix compilation of MathExtras.h on Windows with /sdl #5809

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f13b2a
Fix compilation of MathExtras.h on Windows with /sdl
bhall-ctre Oct 24, 2023
f8adb25
Add a patch to upstream_utils
bhall-ctre Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion wpiutil/src/main/native/thirdparty/llvm/include/wpi/MathExtras.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,10 @@ inline uint64_t alignTo(uint64_t Value, uint64_t Align) {
inline uint64_t alignToPowerOf2(uint64_t Value, uint64_t Align) {
assert(Align != 0 && (Align & (Align - 1)) == 0 &&
"Align must be a power of 2");
return (Value + Align - 1) & -Align;
// Replace unary minus to avoid compilation error on Windows:
// "unary minus operator applied to unsigned type, result still unsigned"
uint64_t negAlign = (~Align) + 1;
return (Value + Align - 1) & negAlign;
}

/// If non-zero \p Skew is specified, the return value will be a minimal integer
Expand Down
Loading