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

Include support for Windows in 1.0.0 #312

Merged
merged 5 commits into from
Dec 11, 2024

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Nov 14, 2024

For visibility reason I created a branch called dev/1.0.0 in this repository, otherwise I can't open the PR

Include support for Windows in 1.0.0

@ahcorde ahcorde self-assigned this Nov 14, 2024
@Yadunund Yadunund deleted the branch rolling November 27, 2024 22:50
@Yadunund Yadunund closed this Nov 27, 2024
@ahcorde ahcorde reopened this Dec 4, 2024
@ahcorde ahcorde force-pushed the ahcorde/rolling/1.0.0_windows branch from 924a3b1 to 73613dd Compare December 5, 2024 11:25
@ahcorde
Copy link
Contributor Author

ahcorde commented Dec 6, 2024

rcl

  • test_service__rmw_zenoh_cpp
109: C:\ros2_ws\src\ros2\rcl\rcl\test\rcl\test_service.cpp(186): error: Expected: (header.received_timestamp) >= (start_timestamp), actual: 17334916552003159 vs 1733491655200247800
109:
109: C:\ros2_ws\src\ros2\rcl\rcl\test\rcl\test_service.cpp(187): error: Expected: (header.received_timestamp) >= (header.source_timestamp), actual: 17334916552003159 vs 1733491655200264100
109:
109: C:\ros2_ws\src\ros2\rcl\rcl\test\rcl\test_service.cpp(213): error: Expected: (header.received_timestamp) >= (start_timestamp), actual: 17334916552006893 vs 1733491655200522000
109:
109: C:\ros2_ws\src\ros2\rcl\rcl\test\rcl\test_service.cpp(214): error: Expected: (header.received_timestamp) >= (header.source_timestamp), actual: 17334916552006893 vs 1733491655200530700

rcl_action

rcl_lifecycle

@Yadunund
Copy link
Member

Yadunund commented Dec 9, 2024

@ahcorde could we rebase this to target rolling?

@ahcorde ahcorde changed the base branch from dev/1.0.0 to rolling December 9, 2024 09:52
@ahcorde
Copy link
Contributor Author

ahcorde commented Dec 9, 2024

@ahcorde could we rebase this to target rolling?

@Yadunund Done!

Comment on lines 81 to 86
// z_owned_string_t shm_enabled;
// zc_config_get_from_str(z_loan(config), Z_CONFIG_SHARED_MEMORY_KEY, &shm_enabled);
// auto always_free_shm_enabled = rcpputils::make_scope_exit(
// [&shm_enabled]() {
// z_drop(z_move(shm_enabled));
// });
Copy link
Member

Choose a reason for hiding this comment

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

Does the code not compile if uncommented on Windows?

Instead of commenting it for all users, can we rely on #ifdef blocks?

@Yadunund Yadunund force-pushed the ahcorde/rolling/1.0.0_windows branch 2 times, most recently from e734f05 to 5e5836c Compare December 9, 2024 13:25
@ahcorde ahcorde force-pushed the ahcorde/rolling/1.0.0_windows branch from 5e5836c to 3b6fb80 Compare December 9, 2024 13:29
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>

Removed some warnings

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>

Removed C4099 Windows warning

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>

Support Windows

Signed-off-by: Yadunund <[email protected]>

undo changes

Signed-off-by: Yadunund <[email protected]>
@Yadunund Yadunund force-pushed the ahcorde/rolling/1.0.0_windows branch from 3b6fb80 to 26360a8 Compare December 9, 2024 13:40
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde ahcorde requested a review from Yadunund December 9, 2024 16:07
Copy link
Member

@Yadunund Yadunund left a comment

Choose a reason for hiding this comment

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

LGTM.

@clalancette any opinions here?

@ahcorde ahcorde requested a review from clalancette December 10, 2024 12:17
ahcorde and others added 2 commits December 11, 2024 11:48
Just so we don't have to use as many workarounds.

Signed-off-by: Chris Lalancette <[email protected]>
Copy link
Collaborator

@clalancette clalancette left a comment

Choose a reason for hiding this comment

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

I made a couple of updates here to use less of MSC_VER, and to try to do less casting as well. With that, I'm happy with this, so I'm going to approve and merge.

///=============================================================================
class rmw_context_impl_s final
struct rmw_context_impl_s final
Copy link
Member

Choose a reason for hiding this comment

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

@clalancette was this change to struct intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is a warning on Windows, rmw_context_impl_s is defined in the rmw as a struct but we are implementing this as a class.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@clalancette was this change to struct intentional?

Yes, because otherwise Windows complains that it is defined as a struct in rmw.h, but as a class here.

Copy link
Member

Choose a reason for hiding this comment

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

I see. Thanks for pointing that out.

@clalancette clalancette merged commit a7187eb into rolling Dec 11, 2024
6 checks passed
@clalancette clalancette deleted the ahcorde/rolling/1.0.0_windows branch December 11, 2024 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants