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

Fix Windows conflicting macros and missing usleep #885

Merged

Conversation

jnoyola
Copy link

@jnoyola jnoyola commented Feb 6, 2019

Addressing the issue mentioned here: #884
<windows.h> is included indirectly via gazebo, which causes conflicts within gazebo_ros_packages and in included ros2 headers.

  1. OUT is a macro in Windows and used in templates in gazebo_ros. Fixed by changing to T.
  2. NO_ERROR is a macro in Windows and used in tf2 in ros2. Fixed with #undef.
  3. usleep does not exist in Windows. Fixed with macro.
  4. ImuSensorPlugin unresolved external symbols. Fixed by linking to gazebo_ros_imu_sensor.

@jnoyola
Copy link
Author

jnoyola commented Feb 6, 2019

Could someone help me figure out what's going on with the latest test failures? I'm not super familiar with Jenkins, but I see there's only one that's a fresh failure, but I'm not sure where to go from here. Thanks!

Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

test_node is a known test failure which #860 is supposed to fix, so don't worry about it.

Thanks for the fixes!

@chapulina chapulina merged commit 9dfd1fe into ros-simulation:ros2 Feb 8, 2019
@chapulina chapulina added the ros2 label Feb 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants