Do not assume that std::int64_t is identical to long int #1488
Conversation
This file contains 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
laurynas-biveinis
force-pushed
the
macos-202408-fixes
branch
from
a09e0a0
to
dafb3e1
Compare
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
1 similar comment
|
@luqun has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@laurynas-biveinis , could you rebase this PR? |
- printf int64_t values with PRId64
- Specify std::make_pair template arguments. Alternatively we could introduce a
constexpr variable for uninitialized opids.
This fixes new macOS build regressions, only one example per error class:
sql/xa.cc:382:11: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat]
info.smallest_lwm_opid.first, info.smallest_lwm_opid.second,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
storage/innobase/trx/trx0sys.cc:271:16: error: invalid operands to binary expression ('const std::pair<int64_t, int64_t>' (aka 'const pair<long long, long long>') and 'pair<typename __unwrap_ref_decay<long>::type, typename __unwrap_ref_decay<long>::type>' (aka 'pair<long, long>'))
if (lwm_opid != std::make_pair(-1L, -1L)) {
~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~
Squash with 5f045b4
laurynas-biveinis
force-pushed
the
macos-202408-fixes
branch
from
dafb3e1
to
3a7c548
Compare
|
@laurynas-biveinis has updated the pull request. You must reimport the pull request before landing. |
|
@luqun , rebased |
|
@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 2dc2bdd. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
constexpr variable for uninitialized opids.
This fixes new macOS build regressions, only one example per error class:
sql/xa.cc:382:11: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat]
info.smallest_lwm_opid.first, info.smallest_lwm_opid.second,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
storage/innobase/trx/trx0sys.cc:271:16: error: invalid operands to binary expression ('const std::pair<int64_t, int64_t>' (aka 'const pair<long long, long long>') and 'pair<typename __unwrap_ref_decay::type, typename __unwrap_ref_decay::type>' (aka 'pair<long, long>'))
if (lwm_opid != std::make_pair(-1L, -1L)) {
~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~
Squash with 5f045b4