Remove deprecated functions (#673)

Signed-off-by: Ian Chen <[email protected]>
gazebosim · Aug 7, 2024 · 6ffaeb1 · 6ffaeb1
1 parent 872f027
commit 6ffaeb1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 38 deletions.
diff --git 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<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>

diff --git a/include/gz/physics/detail/FreeGroup.hh b/include/gz/physics/detail/FreeGroup.hh
@@ -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(

diff --git 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
@@ -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");