Solve conflicts

Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Jun 11, 2024 · 60e3d8b · 60e3d8b
1 parent 548a445
commit 60e3d8b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 151 deletions.
diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@@ -222,88 +222,12 @@ void DomainParticipantImpl::disable()
     efd::DomainParticipantImpl::disable();
 }
 
-<<<<<<< HEAD
-=======
 ReturnCode_t DomainParticipantImpl::delete_contained_entities()
 {
     delete_statistics_builtin_entities();
     return efd::DomainParticipantImpl::delete_contained_entities();
 }
 
-ReturnCode_t DomainParticipantImpl::enable_monitor_service()
-{
-    ReturnCode_t ret = efd::RETCODE_OK;
-
-    if (!rtps_participant_->is_monitor_service_created())
-    {
-        status_observer_.store(rtps_participant_->create_monitor_service(*this));
-    }
-
-    if (!rtps_participant_->enable_monitor_service() ||
-            nullptr == status_observer_)
-    {
-        ret = efd::RETCODE_ERROR;
-    }
-
-    return ret;
-}
-
-ReturnCode_t DomainParticipantImpl::disable_monitor_service()
-{
-    ReturnCode_t ret = efd::RETCODE_OK;
-
-    if (!rtps_participant_->is_monitor_service_created() ||
-            !rtps_participant_->disable_monitor_service())
-    {
-        ret = efd::RETCODE_NOT_ENABLED;
-    }
-
-    return ret;
-}
-
-ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message(
-        fastrtps::rtps::ParticipantProxyData& data,
-        fastdds::statistics::MonitorServiceStatusData& msg)
-{
-    ReturnCode_t ret{efd::RETCODE_OK};
-
-    if (!get_rtps_participant()->fill_discovery_data_from_cdr_message(data, msg))
-    {
-        ret = efd::RETCODE_ERROR;
-    }
-
-    return ret;
-}
-
-ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message(
-        fastrtps::rtps::WriterProxyData& data,
-        fastdds::statistics::MonitorServiceStatusData& msg)
-{
-    ReturnCode_t ret{efd::RETCODE_OK};
-
-    if (!get_rtps_participant()->fill_discovery_data_from_cdr_message(data, msg))
-    {
-        ret = efd::RETCODE_ERROR;
-    }
-
-    return ret;
-}
-
-ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message(
-        fastrtps::rtps::ReaderProxyData& data,
-        fastdds::statistics::MonitorServiceStatusData& msg)
-{
-    ReturnCode_t ret{efd::RETCODE_OK};
-
-    if (!get_rtps_participant()->fill_discovery_data_from_cdr_message(data, msg))
-    {
-        ret = efd::RETCODE_ERROR;
-    }
-
-    return ret;
-}
-
->>>>>>> 0d62335cc (Properly delete builtin statistics writers upon `delete_contained_entities()`  (#4891))
 efd::PublisherImpl* DomainParticipantImpl::create_publisher_impl(
         const efd::PublisherQos& qos,
         efd::PublisherListener* listener)

diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
@@ -99,89 +99,15 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl
     static bool is_statistics_topic_name(
             const std::string& topic_name) noexcept;
 
-<<<<<<< HEAD
-=======
     /**
      * @brief This override calls the parent method and returns builtin publishers to nullptr
      *
      * @return RETCODE_OK if successful
      * @note This method is meant to be used followed by a deletion of the participant as it implies
      * the deletion of the builtin statistics publishers.
      */
-    efd::ReturnCode_t delete_contained_entities() override;
+    ReturnCode_t delete_contained_entities() override;
 
-    /**
-     * Enables the monitor service in this DomainParticipant.
-     *
-     * @return RETCODE_OK if the monitor service could be correctly enabled.
-     * @return RETCODE_ERROR if the monitor service could not be enabled properly.
-     * @return RETCODE_UNSUPPORTED if FASTDDS_STATISTICS is not enabled.
-     *
-     */
-    efd::ReturnCode_t enable_monitor_service();
-
-    /**
-     * Disables the monitor service in this DomainParticipant. Does nothing if the service was not enabled before.
-     *
-     * @return RETCODE_OK if the monitor service could be correctly disabled.
-     * @return RETCODE_NOT_ENABLED if the monitor service was not previously enabled.
-     * @return RETCODE_ERROR if the service could not be properly disabled.
-     * @return RETCODE_UNSUPPORTED if FASTDDS_STATISTICS is not enabled.
-     *
-     */
-    efd::ReturnCode_t disable_monitor_service();
-
-    /**
-     * fills in the ParticipantProxyData from a MonitorService Message
-     *
-     * @param [out] data Proxy to fill
-     * @param [in] msg MonitorService Message to get the proxy information from.
-     *
-     * @return RETCODE_OK if the operation succeeds.
-     * @return RETCODE_ERROR if the  operation fails.
-     */
-    efd::ReturnCode_t fill_discovery_data_from_cdr_message(
-            fastrtps::rtps::ParticipantProxyData& data,
-            fastdds::statistics::MonitorServiceStatusData& msg);
-
-    /**
-     * fills in the WriterProxyData from a MonitorService Message
-     *
-     * @param [out] data Proxy to fill.
-     * @param [in] msg MonitorService Message to get the proxy information from.
-     *
-     * @return RETCODE_OK if the operation succeeds.
-     * @return RETCODE_ERROR if the  operation fails.
-     */
-    efd::ReturnCode_t fill_discovery_data_from_cdr_message(
-            fastrtps::rtps::WriterProxyData& data,
-            fastdds::statistics::MonitorServiceStatusData& msg);
-
-    /**
-     * fills in the ReaderProxyData from a MonitorService Message
-     *
-     * @param [out] data Proxy to fill.
-     * @param [in] msg MonitorService Message to get the proxy information from.
-     *
-     * @return RETCODE_OK if the operation succeeds.
-     * @return RETCODE_ERROR if the  operation fails.
-     */
-    efd::ReturnCode_t fill_discovery_data_from_cdr_message(
-            fastrtps::rtps::ReaderProxyData& data,
-            fastdds::statistics::MonitorServiceStatusData& msg);
-
-    /**
-     * Gets the status observer for that entity
-     *
-     * @return status observer
-     */
-
-    const rtps::IStatusObserver* get_status_observer()
-    {
-        return status_observer_.load();
-    }
-
->>>>>>> 0d62335cc (Properly delete builtin statistics writers upon `delete_contained_entities()`  (#4891))
 protected:
 
     /**