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.

Sign up for GitHub

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 deprecated function #673

Merged
merged 1 commit into from
Aug 7, 2024
Merged

Remove deprecated function #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions include/gz/physics/FreeGroup.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,6 @@ namespace gz

/// \brief const version of RootLink()
public: ConstLinkPtr<PolicyT, FeaturesT> RootLink() const;

/// \brief The root link of this FreeGroup. This link is the root of one
/// of the kinematic trees represented by this FreeGroup. Getting and
/// setting properties (like poses and velocities) on the group will be
/// done in terms of this link.
/// DEPRECATED. Please use RootLink()
public: LinkPtr<PolicyT, FeaturesT> GZ_DEPRECATED(4.0) CanonicalLink();

/// \brief const version of CanonicalLink()
/// DEPRECATED. Please use RootLink()
public: ConstLinkPtr<PolicyT, FeaturesT> GZ_DEPRECATED(4.0)
CanonicalLink() const;
};

public: template <typename PolicyT>
Expand Down
16 changes: 0 additions & 16 deletions include/gz/physics/detail/FreeGroup.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,6 @@ namespace gz
->GetFreeGroupRootLink(this->identity));
}

/////////////////////////////////////////////////
template <typename PolicyT, typename FeaturesT>
LinkPtr<PolicyT, FeaturesT>
FindFreeGroupFeature::FreeGroup<PolicyT, FeaturesT>::CanonicalLink()
{
return this->RootLink();
}

/////////////////////////////////////////////////
template <typename PolicyT, typename FeaturesT>
ConstLinkPtr<PolicyT, FeaturesT>
FindFreeGroupFeature::FreeGroup<PolicyT, FeaturesT>::CanonicalLink() const
{
return this->RootLink();
}

/////////////////////////////////////////////////
template <typename PolicyT, typename FeaturesT>
void SetFreeGroupWorldPose::FreeGroup<PolicyT, FeaturesT>::SetWorldPose(
Expand Down
8 changes: 1 addition & 7 deletions test/common_test/simulation_features.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,6 @@ TYPED_TEST(SimulationFeaturesTestFreeGroup, FreeGroup)
auto model = world->GetModel("sphere");
auto freeGroup = model->FindFreeGroup();
ASSERT_NE(nullptr, freeGroup);
GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
ASSERT_NE(nullptr, freeGroup->CanonicalLink());
GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
ASSERT_NE(nullptr, freeGroup->RootLink());

auto link = model->GetLink("sphere_link");
Expand Down Expand Up @@ -1273,10 +1270,7 @@ TYPED_TEST(SimulationFeaturesTestBasic, MultipleCollisions)
auto model = world->GetModel("box");
auto freeGroup = model->FindFreeGroup();
ASSERT_NE(nullptr, freeGroup);
GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
ASSERT_NE(nullptr, freeGroup->CanonicalLink());
GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
ASSERT_NE(nullptr, freeGroup->RootLink());
ASSERT_NE(nullptr, freeGroup->RootLink());

auto link = model->GetLink("box_link");
auto freeGroupLink = link->FindFreeGroup();
Expand Down
3 changes: 0 additions & 3 deletions tpe/plugin/src/SimulationFeatures_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,6 @@ TEST_P(SimulationFeatures_TEST, FreeGroup)
auto model = world->GetModel("sphere");
auto freeGroup = model->FindFreeGroup();
ASSERT_NE(nullptr, freeGroup);
GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
ASSERT_NE(nullptr, freeGroup->CanonicalLink());
GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
ASSERT_NE(nullptr, freeGroup->RootLink());

auto link = model->GetLink("sphere_link");
Expand Down
Loading