Rename (un)likely to avoid conflict with boost #127
Closed
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
facebook-github-bot
added
CLA Signed
|
This pull request was exported from Phabricator. Differential Revision: D44730441 |
Summary: Pull Request resolved: facebookincubator#127 Boost has defintions for likely and unlikely that conflict and can cause compiler errors. Renaming to __hbt_likely and __hbt_unlikley to resolve the conflict. Reviewed By: jj10306 Differential Revision: D44730441 fbshipit-source-id: 338754ba0e5a2add03809639d5d433faa0d0b8ed
|
This pull request was exported from Phabricator. Differential Revision: D44730441 |
bigzachattack
force-pushed
the
export-D44730441
branch
from
d156834 to
980ede8
Compare
|
This pull request has been merged in 72cb3f9. |
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.
Summary: Boost has defintions for likely and unlikely that conflict and can cause compiler errors. Renaming to __hbt_likely and __hbt_unlikley to resolve the conflict.
Differential Revision: D44730441