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

Explicit convert from std::filesystem::path to std::string for Windows compatibility (backport #3249) #3253

Merged
merged 3 commits into from
Jan 20, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 20, 2025

Description

On Linux and macOS std::filesystem::path is implicitly convertible to std::string, while on Windows it is convertible to std::wstring, see https://en.cppreference.com/w/cpp/filesystem/path and https://stackoverflow.com/questions/57377349/implicit-conversion-between-stdfilesystempath-and-stdstring-should-it-hap . If we want to convert std::filesystem::path to std::string in a Windows-compatible way, it is then necessary to explicitly call the .string() method.

Fix part of #2391 .

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

This is an automatic backport of pull request #3249 done by [Mergify](https://mergify.com).

…s compatibility (#3249)

(cherry picked from commit 2b9173b)

# Conflicts:
#	moveit_setup_assistant/moveit_setup_assistant/src/setup_assistant_widget.cpp
#	moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp
@mergify mergify bot added the conflicts label Jan 20, 2025
Copy link
Author

mergify bot commented Jan 20, 2025

Cherry-pick of 2b9173b has failed:

On branch mergify/bp/humble/pr-3249
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 2b9173b37.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   moveit_setup_assistant/moveit_setup_assistant/src/collisions_updater.cpp
	modified:   moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files.hpp
	modified:   moveit_setup_assistant/moveit_setup_core_plugins/src/configuration_files_widget.cpp
	modified:   moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen.cpp
	modified:   moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen_widget.cpp
	modified:   moveit_setup_assistant/moveit_setup_framework/include/moveit_setup_framework/data/srdf_config.hpp
	modified:   moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp
	modified:   moveit_setup_assistant/moveit_setup_framework/src/utilities.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_setup_assistant/moveit_setup_assistant/src/setup_assistant_widget.cpp
	both modified:   moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@codecov-commenter
Copy link

codecov-commenter commented Jan 20, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 75.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 51.40%. Comparing base (c705c2c) to head (a67c37b).
Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
...sistant/moveit_setup_framework/src/urdf_config.cpp 66.67% 3 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3253      +/-   ##
==========================================
+ Coverage   51.40%   51.40%   +0.01%     
==========================================
  Files         382      382              
  Lines       31893    31896       +3     
==========================================
+ Hits        16392    16394       +2     
- Misses      15501    15502       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sea-bass sea-bass merged commit 16cce36 into humble Jan 20, 2025
7 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-3249 branch January 20, 2025 19:46
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