Skip to content

cleanup declaration of ModelInterface's SharedPtrs#33

Merged
scpeters merged 1 commit intoros:rollingfrom
ubi-agni:cleanup-modelinterface-declaration
Feb 6, 2026
Merged

cleanup declaration of ModelInterface's SharedPtrs#33
scpeters merged 1 commit intoros:rollingfrom
ubi-agni:cleanup-modelinterface-declaration

Conversation

@rhaschke
Copy link
Copy Markdown
Contributor

I propose to declare the SharedPtrs for ModelInterface together with all other model-related types in urdf_model/types.h instead of urdf_world/types.h.

Currently, even after having included urdf_model/model.h, one also needs to include urdf_world/types.h to get the related SharedPtr definitions.

With this PR, it suffices to include urdf_model/types.h to get all declarations or to include urdf_model/model.h for all declarations and definition of ModelInterface.

Copy link
Copy Markdown
Contributor

@sloretz sloretz left a comment

Choose a reason for hiding this comment

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

Looks like a good change to me.

@scpeters is ros:0.4 the right branch for this? The removal of the type ModelInterfaceSharedPtr from urdf_world/types.h and removal of #include "urdf_model/model.h" from urdf_world/world.h looks like potentially breaking changes if 0.4 has already been released.

@rhaschke rhaschke force-pushed the cleanup-modelinterface-declaration branch from f3a88a2 to c1d1f66 Compare September 21, 2022 09:43
@rhaschke rhaschke changed the base branch from 0.4 to master September 21, 2022 09:44
@rhaschke
Copy link
Copy Markdown
Contributor Author

I'm going through my open PRs and just found this 6-years old one, which was already kind-of approved by @sloretz.
I rebased and retargeted against master and kept the file urdf_world/types.h with a deprecation warning indicating to switch to urdf_model/types.h.
Maybe in this form, it can be merged?

@scpeters
Copy link
Copy Markdown
Contributor

scpeters commented Feb 6, 2026

retargeting to rolling

@scpeters scpeters changed the base branch from master to rolling February 6, 2026 20:50
@scpeters scpeters merged commit 3a1ae72 into ros:rolling Feb 6, 2026
1 check passed
@rhaschke
Copy link
Copy Markdown
Contributor Author

rhaschke commented Feb 8, 2026

Great to see this cleanup merged after all the years. 🎉

ahcorde added a commit that referenced this pull request Feb 9, 2026
scpeters pushed a commit that referenced this pull request Feb 9, 2026
@rhaschke rhaschke deleted the cleanup-modelinterface-declaration branch February 9, 2026 20:49
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