From 45ef11aacc6b2cc2b4dd6d032dddbdd76e25f5fe Mon Sep 17 00:00:00 2001 From: Kerstin Keller Date: Wed, 4 Dec 2024 07:50:09 +0100 Subject: [PATCH] [core] Remove PubShareType / PubShareDescription (set via publisher configuration). --- ecal/core/include/ecal/ecal_util.h | 16 ---------------- ecal/core/src/ecal_util.cpp | 14 -------------- ecal/core/src/pubsub/ecal_pubgate.cpp | 16 +--------------- ecal/core/src/pubsub/ecal_pubgate.h | 8 -------- 4 files changed, 1 insertion(+), 53 deletions(-) diff --git a/ecal/core/include/ecal/ecal_util.h b/ecal/core/include/ecal/ecal_util.h index 6f83e81031..82278b73b0 100644 --- a/ecal/core/include/ecal/ecal_util.h +++ b/ecal/core/include/ecal/ecal_util.h @@ -92,22 +92,6 @@ namespace eCAL **/ ECAL_API void ShutdownCore(); - /** - * @brief Enable process wide eCAL publisher topic type sharing - * that is needed for reflection on subscriber side. - * - * @param state_ Switch on type sharing - **/ - ECAL_API void PubShareType(bool state_); - - /** - * @brief Enable process wide eCAL publisher topic description sharing - * that is needed for reflection on subscriber side. - * - * @param state_ Switch on description sharing - **/ - ECAL_API void PubShareDescription(bool state_); - /** * @brief Splits the topic type (eCAL < 5.12) into encoding and types (>= eCAL 5.12) * diff --git a/ecal/core/src/ecal_util.cpp b/ecal/core/src/ecal_util.cpp index 32daa98b47..9e2f53780a 100644 --- a/ecal/core/src/ecal_util.cpp +++ b/ecal/core/src/ecal_util.cpp @@ -33,20 +33,6 @@ namespace eCAL { namespace Util { - void PubShareType(bool state_) - { -#if ECAL_CORE_PUBLISHER - if (g_pubgate() != nullptr) g_pubgate()->ShareType(state_); -#endif - } - - void PubShareDescription(bool state_) - { -#if ECAL_CORE_PUBLISHER - if (g_pubgate() != nullptr) g_pubgate()->ShareDescription(state_); -#endif - } - #if ECAL_CORE_MONITORING // take monitoring snapshot static Monitoring::SMonitoring GetMonitoring() diff --git a/ecal/core/src/pubsub/ecal_pubgate.cpp b/ecal/core/src/pubsub/ecal_pubgate.cpp index 1ca992191c..19e52073f7 100644 --- a/ecal/core/src/pubsub/ecal_pubgate.cpp +++ b/ecal/core/src/pubsub/ecal_pubgate.cpp @@ -37,11 +37,7 @@ namespace eCAL // CPubGate ////////////////////////////////////////////////////////////////// std::atomic CPubGate::m_created; - CPubGate::CPubGate() : - m_share_type(true), - m_share_desc(true) - { - } + CPubGate::CPubGate() = default; CPubGate::~CPubGate() { @@ -69,16 +65,6 @@ namespace eCAL m_created = false; } - void CPubGate::ShareType(bool state_) - { - m_share_type = state_; - } - - void CPubGate::ShareDescription(bool state_) - { - m_share_desc = state_; - } - bool CPubGate::Register(const std::string& topic_name_, const std::shared_ptr& datawriter_) { if(!m_created) return(false); diff --git a/ecal/core/src/pubsub/ecal_pubgate.h b/ecal/core/src/pubsub/ecal_pubgate.h index 0db416cc06..cc73d36bc7 100644 --- a/ecal/core/src/pubsub/ecal_pubgate.h +++ b/ecal/core/src/pubsub/ecal_pubgate.h @@ -44,12 +44,6 @@ namespace eCAL void Start(); void Stop(); - void ShareType(bool state_); - bool TypeShared() const { return m_share_type; }; - - void ShareDescription(bool state_); - bool DescriptionShared() const { return m_share_desc; }; - bool Register(const std::string& topic_name_, const std::shared_ptr& datawriter_); bool Unregister(const std::string& topic_name_, const std::shared_ptr& datawriter_); @@ -60,8 +54,6 @@ namespace eCAL protected: static std::atomic m_created; - bool m_share_type; - bool m_share_desc; using TopicNameDataWriterMapT = std::multimap>; std::shared_timed_mutex m_topic_name_datawriter_sync;