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

Remove GZ_SINGLETON_DECLARE definition workaround (fix for armhf) #3283

Merged
merged 1 commit into from
Oct 10, 2023

Conversation

j-rivero
Copy link
Contributor

Signed-off-by: Jose Luis Rivero jrivero@osrfoundation.org

🦟 Bug fix

Fixes #3208.

Summary

The trick of defining the template function specialized was introduced in a commit part of the Windows works as part of the Windows works, seems to me like a workaround to make the compilation to work somehow. On my Jammy testing system, both clang and gcc compiled it fine with this PR and packages were made using gcc for arm64, armhf and ppc64.

Did not test it on Windows, let's see if the CI is happy or it was indeed needed.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@traversaro
Copy link
Collaborator

Did not test it on Windows, let's see if the CI is happy or it was indeed needed.

Sorry, I forgot about this PR. The conda-forge CI seems to be happy, the Windows 7 one tests are failing but I guess this is expected, so I guess we are good to go?

@talregev
Copy link
Contributor

@j-rivero can you rebase this branch to the latest gazebo11?

@j-rivero
Copy link
Contributor Author

@j-rivero can you rebase this branch to the latest gazebo11?

I can rebase and merge yes.

@j-rivero j-rivero merged commit e65ed2e into gazebo11 Oct 10, 2023
@j-rivero j-rivero deleted the jrivero/remove_singleton_definitions branch October 10, 2023 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants