From 03f6a9b4c7feb1e23b47c2413acdc3ca9160a044 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Tue, 28 Dec 2021 16:54:19 +0100 Subject: [PATCH] Revert deprecation of ACM::setEntry(name, allowed) This reverts commit 73acbdedf775f4461e4c5da8a82e70783864ee09. Instead, just hint at setDefaultEntry(). --- .../include/moveit/collision_detection/collision_matrix.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h b/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h index 550ecef5448..b754a5bb48a 100644 --- a/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h +++ b/moveit_core/collision_detection/include/moveit/collision_detection/collision_matrix.h @@ -152,13 +152,14 @@ class AllowedCollisionMatrix void setEntry(const std::string& name1, const std::string& name2, const DecideContactFn& fn); /** @brief Set the entries corresponding to a name. - * With each of the the known names in the collision matrix, form a pair using the name + * With each of the *known names* in the collision matrix, form a pair using the name * specified as argument to this function and set the entry as indicated by \e allowed. + * As the set of known names might change in future, consider using setDefaultEntry() instead! * @param name the object name * @param allowed If false, indicates that collisions between two elements must be checked for and no collisions * will be ignored (AllowedCollision::NEVER). If true, indicates that collisions between two elements are ok and an * explicit collision computation is not necessary (AllowedCollision::ALWAYS).*/ - [[deprecated]] void setEntry(const std::string& name, bool allowed); + void setEntry(const std::string& name, bool allowed); /** @brief Set multiple entries. Pairs of names are formed using \e name and \e other_names * @param name name of first element