diff --git a/include/gz/physics/FreeGroup.hh b/include/gz/physics/FreeGroup.hh index fea6fd401..ec30cb1f1 100644 --- a/include/gz/physics/FreeGroup.hh +++ b/include/gz/physics/FreeGroup.hh @@ -85,18 +85,6 @@ namespace gz /// \brief const version of RootLink() public: ConstLinkPtr 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 GZ_DEPRECATED(4.0) CanonicalLink(); - - /// \brief const version of CanonicalLink() - /// DEPRECATED. Please use RootLink() - public: ConstLinkPtr GZ_DEPRECATED(4.0) - CanonicalLink() const; }; public: template diff --git a/include/gz/physics/detail/FreeGroup.hh b/include/gz/physics/detail/FreeGroup.hh index aba0a0ae6..025efdb11 100644 --- a/include/gz/physics/detail/FreeGroup.hh +++ b/include/gz/physics/detail/FreeGroup.hh @@ -84,22 +84,6 @@ namespace gz ->GetFreeGroupRootLink(this->identity)); } - ///////////////////////////////////////////////// - template - LinkPtr - FindFreeGroupFeature::FreeGroup::CanonicalLink() - { - return this->RootLink(); - } - - ///////////////////////////////////////////////// - template - ConstLinkPtr - FindFreeGroupFeature::FreeGroup::CanonicalLink() const - { - return this->RootLink(); - } - ///////////////////////////////////////////////// template void SetFreeGroupWorldPose::FreeGroup::SetWorldPose( diff --git a/test/common_test/simulation_features.cc b/test/common_test/simulation_features.cc index bc30de759..bd2dbbf0e 100644 --- a/test/common_test/simulation_features.cc +++ b/test/common_test/simulation_features.cc @@ -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"); @@ -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(); diff --git a/tpe/plugin/src/SimulationFeatures_TEST.cc b/tpe/plugin/src/SimulationFeatures_TEST.cc index cf44d5485..9995ba7a6 100644 --- a/tpe/plugin/src/SimulationFeatures_TEST.cc +++ b/tpe/plugin/src/SimulationFeatures_TEST.cc @@ -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");