From adce3620ac27eba491aac957748413192718f2b2 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Mon, 29 Sep 2025 15:14:15 -0700 Subject: [PATCH] Remove deprecated GraphCache methods without type hash They were deprecated in #70 for Iron and safe to remove in Jazzy. Signed-off-by: Christophe Bedard --- .../include/rmw_dds_common/graph_cache.hpp | 46 ---------------- rmw_dds_common/src/graph_cache.cpp | 53 ------------------- 2 files changed, 99 deletions(-) diff --git a/rmw_dds_common/include/rmw_dds_common/graph_cache.hpp b/rmw_dds_common/include/rmw_dds_common/graph_cache.hpp index bc08ecf..78c1a3d 100644 --- a/rmw_dds_common/include/rmw_dds_common/graph_cache.hpp +++ b/rmw_dds_common/include/rmw_dds_common/graph_cache.hpp @@ -99,21 +99,6 @@ class GraphCache const rmw_gid_t & participant_gid, const rmw_qos_profile_t & qos); - /// Add a data writer based on discovery. - /** - * See add_reader with rosidl_type_hash_t, whose other parameters match these. - */ - RMW_DDS_COMMON_PUBLIC - RCUTILS_DEPRECATED_WITH_MSG( - "Migrate to using the version of this function taking a type hash.") - bool - add_writer( - const rmw_gid_t & writer_gid, - const std::string & topic_name, - const std::string & type_name, - const rmw_gid_t & participant_gid, - const rmw_qos_profile_t & qos); - /// Add a data reader based on discovery. /** * \param reader_gid GUID of the The data reader. @@ -135,21 +120,6 @@ class GraphCache const rmw_gid_t & participant_gid, const rmw_qos_profile_t & qos); - /// Add a data reader based on discovery. - /** - * See add_reader with rosidl_type_hash_t, whose other parameters match these. - */ - RMW_DDS_COMMON_PUBLIC - RCUTILS_DEPRECATED_WITH_MSG( - "Migrate to using the version of this function taking a type hash.") - bool - add_reader( - const rmw_gid_t & reader_gid, - const std::string & topic_name, - const std::string & type_name, - const rmw_gid_t & participant_gid, - const rmw_qos_profile_t & qos); - /// Add a data reader or writer. /** * \param gid GUID of the entity. @@ -173,22 +143,6 @@ class GraphCache const rmw_qos_profile_t & qos, bool is_reader); - /// Add a data reader or writer. - /** - * See add_entity with rosidl_type_hash_t, whose other parameters match these. - */ - RMW_DDS_COMMON_PUBLIC - RCUTILS_DEPRECATED_WITH_MSG( - "Migrate to using the version of this function taking a type hash.") - bool - add_entity( - const rmw_gid_t & gid, - const std::string & topic_name, - const std::string & type_name, - const rmw_gid_t & participant_gid, - const rmw_qos_profile_t & qos, - bool is_reader); - /// Remove a data writer. /** * \param gid GUID of the data writer. diff --git a/rmw_dds_common/src/graph_cache.cpp b/rmw_dds_common/src/graph_cache.cpp index 52f6b20..8c2a46b 100644 --- a/rmw_dds_common/src/graph_cache.cpp +++ b/rmw_dds_common/src/graph_cache.cpp @@ -80,23 +80,6 @@ GraphCache::add_writer( return pair.second; } -bool -GraphCache::add_writer( - const rmw_gid_t & gid, - const std::string & topic_name, - const std::string & type_name, - const rmw_gid_t & participant_gid, - const rmw_qos_profile_t & qos) -{ - return this->add_writer( - gid, - topic_name, - type_name, - rosidl_get_zero_initialized_type_hash(), - participant_gid, - qos); -} - bool GraphCache::add_reader( const rmw_gid_t & gid, @@ -115,23 +98,6 @@ GraphCache::add_reader( return pair.second; } -bool -GraphCache::add_reader( - const rmw_gid_t & gid, - const std::string & topic_name, - const std::string & type_name, - const rmw_gid_t & participant_gid, - const rmw_qos_profile_t & qos) -{ - return this->add_reader( - gid, - topic_name, - type_name, - rosidl_get_zero_initialized_type_hash(), - participant_gid, - qos); -} - bool GraphCache::add_entity( const rmw_gid_t & gid, @@ -160,25 +126,6 @@ GraphCache::add_entity( qos); } -bool -GraphCache::add_entity( - const rmw_gid_t & gid, - const std::string & topic_name, - const std::string & type_name, - const rmw_gid_t & participant_gid, - const rmw_qos_profile_t & qos, - bool is_reader) -{ - return this->add_entity( - gid, - topic_name, - type_name, - rosidl_get_zero_initialized_type_hash(), - participant_gid, - qos, - is_reader); -} - bool GraphCache::remove_writer(const rmw_gid_t & gid) {