Fix LLVM 14 build regression under macOS #1492
Closed
Conversation
This file contains hidden or 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
This fixes, trivially:
sql/xa/recovery.cc:234:33: error: invalid operands to binary expression ('std::pair<int64_t, int64_t>' (aka 'pair<long long, long long>') and 'pair<typename __unwrap_ref_decay<long>::type, typename __unwrap_ref_decay<long>::type>' (aka 'pair<long, long>'))
if (info->smallest_lwm_opid == std::make_pair(-1L, -1L) ||
~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~
Squash with 9fc35fa
This fixes the same class of errors as 2dc2bdd,
but the current error does not trigger with XCode clang for some reason, and is
only visible with LLVM 14 (possibly other versions too) from Homebrew.
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
This pull request has been merged in 6e0be94. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This fixes, trivially:
sql/xa/recovery.cc:234:33: error: invalid operands to binary expression ('std::pair<int64_t, int64_t>' (aka 'pair<long long, long long>') and 'pair<typename __unwrap_ref_decay::type, typename __unwrap_ref_decay::type>' (aka 'pair<long, long>'))
if (info->smallest_lwm_opid == std::make_pair(-1L, -1L) ||
~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~
Squash with 9fc35fa
This fixes the same class of errors as 2dc2bdd,
but the current error does not trigger with XCode clang for some reason, and is
only visible with LLVM 14 (possibly other versions too) from Homebrew.