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.

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

[windows][master] some more header inclusion and MSVC build error fixes. #1636

Merged
merged 12 commits into from
Aug 30, 2019

Conversation

seanyen
Copy link
Contributor

@seanyen seanyen commented Aug 21, 2019

  • Fix header inclusion problems found on Windows\MSVC build.
  • Do static_cast for index in plan_execution::PlanExecution::successfulTrajectorySegmentExecution to avoid MSVC compiler error.
  • Add const for SortBodies::operator() to avoid C3848 error by MSVC.
  • Use c++11 <random> for portable random number generation.

@seanyen seanyen changed the title [windows][master] some more header inclusion related fixes. [windows][master] some more header inclusion and MSVC build error fixes. Aug 21, 2019
Copy link
Contributor

@v4hn v4hn left a comment

Choose a reason for hiding this comment

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

Overall this looks good, but please have a look at my comments.

Thank you so much for taking the time to clean up such micro-issues.

@seanyen
Copy link
Contributor Author

seanyen commented Aug 22, 2019

@v4hn Thanks for the review. I updated the pull requests to address some feedback.

Copy link
Contributor

@v4hn v4hn left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@v4hn v4hn added the awaits 2nd review one maintainer approved this request label Aug 22, 2019
Copy link
Contributor

@rhaschke rhaschke left a comment

Choose a reason for hiding this comment

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

Most of these changes make sense to me. Please have a look at my comments.

@v4hn
Copy link
Contributor

v4hn commented Aug 22, 2019 via email

@v4hn
Copy link
Contributor

v4hn commented Aug 22, 2019 via email

@rhaschke
Copy link
Contributor

So I do not see the merit of avoiding 1-3 defines in addition to the guarded includes.

To be clear about this: In the code base we would just do:
#include <moveit_core/utils/compat.h>
where needed. Using option 1. from above, we would also need the ifdef'ed include, which I don't prefer as well. However, using the second option, there is nothing more to do.

@v4hn
Copy link
Contributor

v4hn commented Aug 22, 2019 via email

Co-Authored-By: Robert Haschke <rhaschke@users.noreply.github.com>
@rhaschke rhaschke merged commit a9f2323 into moveit:master Aug 30, 2019
@rhaschke
Copy link
Contributor

Thanks for your patience 😉

@v4hn
Copy link
Contributor

v4hn commented Aug 30, 2019

Thanks @seanyen 👍

henningkayser pushed a commit to PickNikRobotics/moveit that referenced this pull request Nov 21, 2019
…eit#1636)

* Fix header inclusion for Windows build.
* replace random() with c++11 <random> usage.
rhaschke pushed a commit to ubi-agni/moveit that referenced this pull request Feb 8, 2020
…eit#1636)

* Fix header inclusion for Windows build.
* replace random() with c++11 <random> usage.
sjahr pushed a commit to sjahr/moveit that referenced this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaits 2nd review one maintainer approved this request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants