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

Jump to bottom

[18149] Fix build on msvc 19.36.32528 #3462

Merged
merged 3 commits into from
Apr 17, 2023
Merged

[18149] Fix build on msvc 19.36.32528 #3462

merged 3 commits into from
Apr 17, 2023

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Apr 17, 2023 •
edited by jsan-rt
Loading

Description

This should fix #3451 by adding an alias for xtime on newer versions of MSVC.

@Mergifyio backport 2.9.x 2.6.x 2.1.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelCompany MiguelCompany added the no-test Skip CI tests if PR marked with this label label Apr 17, 2023
@MiguelCompany MiguelCompany added this to the v2.10.2 milestone Apr 17, 2023
@MiguelCompany MiguelCompany changed the title Prepare for msc 193632528 Fix build on msvc 19.36.32528 Apr 17, 2023
@MiguelCompany
Refs #18147. Fix linter.
eb209f7 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany changed the title Fix build on msvc 19.36.32528 [18149] Fix build on msvc 19.36.32528 Apr 17, 2023
@MiguelCompany
Copy link
Member Author

@richiprosima Please test this

@JesusPoderoso
Copy link
Contributor

@Mergifyio backport 2.9.x 2.6.x 2.1.x

@mergify
Copy link
Contributor

mergify bot commented Apr 17, 2023 •
edited
Loading

backport 2.9.x 2.6.x 2.1.x

✅ Backports have been created

JesusPoderoso
JesusPoderoso approved these changes Apr 17, 2023
View reviewed changes
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JesusPoderoso JesusPoderoso added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Apr 17, 2023
@MiguelCompany MiguelCompany mentioned this pull request Apr 17, 2023
Closed
1 task
@MiguelCompany MiguelCompany merged commit 14de049 into master Apr 17, 2023
@MiguelCompany MiguelCompany deleted the prepare-for-msc-193632528 branch April 17, 2023 12:16
mergify bot pushed a commit that referenced this pull request Apr 17, 2023
@MiguelCompany @mergify
Fix build on msvc 19.36.32528 (#3462)
0645cf3 
* Refs #18147. Fix build on new MSVC versions

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Document reason for alias.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Fix linter.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 14de049)
@mergify mergify bot mentioned this pull request Apr 17, 2023
Merged
mergify bot pushed a commit that referenced this pull request Apr 17, 2023
@MiguelCompany @mergify
Fix build on msvc 19.36.32528 (#3462)
122bf08 
* Refs #18147. Fix build on new MSVC versions

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Document reason for alias.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Fix linter.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 14de049)
mergify bot pushed a commit that referenced this pull request Apr 17, 2023
@MiguelCompany @mergify
Fix build on msvc 19.36.32528 (#3462)
9632109 
* Refs #18147. Fix build on new MSVC versions

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Document reason for alias.

Signed-off-by: Miguel Company <[email protected]>

* Refs #18147. Fix linter.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 14de049)
This was referenced Apr 17, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JesusPoderoso JesusPoderoso JesusPoderoso approved these changes

Assignees
No one assigned
Labels
no-test Skip CI tests if PR marked with this label ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v2.10.2
Development

Successfully merging this pull request may close these issues.

[18147] xtime will be changed to _timespec64 in an upcoming release of MSVC
2 participants
@MiguelCompany @JesusPoderoso